Compare commits
167 Commits
agent/w092
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a306fae5c9 | ||
|
|
6941513d15 | ||
|
|
ea0d6a66d0 | ||
|
|
a764ab3331 | ||
|
|
3b4748da31 | ||
|
|
42edf4032b | ||
|
|
112de090e3 | ||
|
|
a2c1cf9c2c | ||
|
|
f7a0d5b746 | ||
|
|
8a67b68cf2 | ||
|
|
04d3d1e87d | ||
|
|
7a44876cbd | ||
|
|
c628bab36c | ||
|
|
ed6f7f6fa5 | ||
|
|
be309e8f72 | ||
|
|
f0b3637abe | ||
|
|
bc3fd4fe0b | ||
|
|
f6280e83d3 | ||
|
|
c1867e6aa8 | ||
|
|
8f655e0ff6 | ||
|
|
c8b2789812 | ||
|
|
bdf061817b | ||
|
|
59961aa6a4 | ||
|
|
5ee2a2ee3a | ||
|
|
ec965ad591 | ||
|
|
d14d33d0b5 | ||
|
|
8e47db4a27 | ||
|
|
2bdc63eab7 | ||
|
|
f2006bdd15 | ||
|
|
164de9ceaf | ||
|
|
c3dd1c08c0 | ||
|
|
d5b07803ff | ||
|
|
2b4de43971 | ||
|
|
ab9cdd32e1 | ||
|
|
d83fa089e2 | ||
|
|
aed62d8530 | ||
|
|
85d653b0db | ||
|
|
bf4d1c8130 | ||
|
|
8a0c882d14 | ||
|
|
361763ad3e | ||
|
|
3c8503a947 | ||
|
|
5cc6dd1a4e | ||
|
|
f1db6b656e | ||
|
|
c8c8a71e22 | ||
|
|
f7f36d59f8 | ||
|
|
f1d824acd9 | ||
|
|
f393788bb9 | ||
|
|
da26714711 | ||
|
|
5d4b208246 | ||
|
|
0cffbfe4bf | ||
|
|
12e857a9e2 | ||
|
|
a8ac234de8 | ||
|
|
60febe20c3 | ||
|
|
b275eb2d99 | ||
|
|
e47a8e949d | ||
|
|
fa7f4c26e8 | ||
|
|
239334ba8d | ||
|
|
179cd4e3c3 | ||
|
|
09fc62528e | ||
|
|
dbbdc3dd98 | ||
|
|
4789b7c32f | ||
|
|
ad5b9deae3 | ||
|
|
5046adc6da | ||
|
|
87214ff944 | ||
|
|
54ca052b41 | ||
|
|
2ce8487681 | ||
|
|
47fe453260 | ||
|
|
2d4cfa7094 | ||
|
|
e27d9e090a | ||
|
|
983a6a2448 | ||
|
|
c1e1157d8b | ||
|
|
005d3734f0 | ||
|
|
55891734ae | ||
|
|
20cf9f9f25 | ||
|
|
2a7cc791b1 | ||
|
|
b2c43f5a66 | ||
|
|
d9b8013644 | ||
|
|
40b87edd73 | ||
|
|
3d7e767cf7 | ||
|
|
10146c1b5f | ||
|
|
82783c6edb | ||
|
|
72e9c8d658 | ||
|
|
0062d65a27 | ||
|
|
f67d537e0b | ||
|
|
2d169c59cf | ||
|
|
bbd98e1e4a | ||
|
|
838b6cb941 | ||
|
|
9936f0a9ed | ||
|
|
a0659667d9 | ||
|
|
e6837211c1 | ||
|
|
ebf00fbce2 | ||
|
|
a2bc1d564a | ||
|
|
da1c3b7ff8 | ||
|
|
710174c707 | ||
|
|
b66bd1ed67 | ||
|
|
ca6529e656 | ||
|
|
44dea2d510 | ||
|
|
f034087510 | ||
|
|
fa8632368e | ||
|
|
dc7725eb2d | ||
|
|
0b67e647ba | ||
|
|
b1e911808f | ||
|
|
c723136fb4 | ||
|
|
a65cd4cb73 | ||
|
|
2ca94fe4d3 | ||
|
|
d558bb14ca | ||
|
|
6604f7319c | ||
|
|
426c03386e | ||
|
|
7152b04d83 | ||
|
|
0155de3e71 | ||
|
|
9321a926cf | ||
|
|
22e6bbed24 | ||
|
|
f49f337c6b | ||
|
|
c3cad09b66 | ||
|
|
11dd7f505a | ||
|
|
52c9ea4b70 | ||
|
|
eef15925f4 | ||
|
|
46baf56e38 | ||
|
|
23b77a337c | ||
|
|
77cf359837 | ||
|
|
af7146a850 | ||
|
|
16023905ce | ||
|
|
f9ebd2f4cc | ||
|
|
ca98b14ad6 | ||
|
|
58a1da1cb3 | ||
|
|
8a0436a92f | ||
|
|
52f4e19325 | ||
|
|
77314b30e0 | ||
|
|
a3f8fc2779 | ||
|
|
2df2f8d6c7 | ||
|
|
6a82485817 | ||
|
|
6d67bbb6eb | ||
|
|
c3dbaf8c8e | ||
|
|
7c6393f96c | ||
|
|
1fd0970728 | ||
|
|
712bd2fc11 | ||
|
|
75c5997851 | ||
|
|
3b9b5e081c | ||
|
|
e75d7024ab | ||
|
|
7c064bc18b | ||
|
|
fe7381b4bc | ||
|
|
f762dfefbd | ||
|
|
8cddc82c43 | ||
|
|
9925a95779 | ||
|
|
f18082e88b | ||
|
|
9ca4385ffb | ||
|
|
8fd7e1cede | ||
|
|
73139514df | ||
|
|
25326f9774 | ||
|
|
8188d9e3c6 | ||
|
|
9550ccb3ff | ||
|
|
38c52baeeb | ||
|
|
55ae09acca | ||
|
|
9d225c150d | ||
|
|
5dac1290eb | ||
|
|
bf65a26b5e | ||
|
|
e174f2c2be | ||
|
|
044ab57149 | ||
|
|
7c64b0a1f9 | ||
|
|
f0722e8397 | ||
|
|
92f6177e64 | ||
|
|
8899a8300c | ||
|
|
46618a101c | ||
|
|
fef6f996d7 | ||
|
|
78bfceef9f | ||
|
|
d220c7accb | ||
|
|
e8911343c6 |
@@ -1,21 +0,0 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2026 TypeSafe AI
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
@@ -1,149 +0,0 @@
|
||||
---
|
||||
name: typesafe-ai
|
||||
license: MIT
|
||||
description: >
|
||||
Build AI-powered software with TypeSafe: small units of AI intelligence you
|
||||
can use like programming primitives. Its System One models, including Jev,
|
||||
turn natural language and application state into typed judgments and
|
||||
probabilities that code can combine. Use when a feature needs programmable
|
||||
common sense, when brainstorming what AI could make possible in an app, or
|
||||
when an LLM prompt-and-parse step could become a structured decision.
|
||||
Applications include routing, ranking, extraction, verification, and
|
||||
interactive experiences; these are starting points, not the limits.
|
||||
Read live docs and cookbooks to find useful patterns and discover new combinations.
|
||||
---
|
||||
|
||||
# Build with TypeSafe
|
||||
|
||||
TypeSafe makes units of AI intelligence usable like programming primitives: small
|
||||
judgments you can compose into larger capabilities. Its **System One models** return
|
||||
fast, focused judgments that software can consume directly. **Jev** is TypeSafe's
|
||||
flagship and first System One model. It understands natural language and returns
|
||||
typed answers and probabilities rather
|
||||
than generating text or reasoning explanations. Code owns the workflow; the model
|
||||
supplies programmable common sense where ordinary code needs semantic understanding.
|
||||
|
||||
## Read the live docs
|
||||
|
||||
**The live TypeSafe docs are the source of truth. Read them as part of the task.**
|
||||
This skill gives direction; the docs carry current concepts, prompting guidance,
|
||||
API contracts, SDK usage, models, limits, and worked examples.
|
||||
|
||||
- Start with the [documentation index](https://docs.typesafe.ai/llms.txt) to discover
|
||||
relevant pages and cookbooks. Use targeted reads rather than loading the entire site.
|
||||
- Mintlify serves Markdown by appending `.md` to a page path, for example
|
||||
[how to build with TypeSafe](https://docs.typesafe.ai/concepts/how-to-build-with-system-one.md).
|
||||
Follow links from the index; convert extensionless documentation page links to
|
||||
`.md` when useful. Resolve relative links against `https://docs.typesafe.ai`.
|
||||
- Before writing an integration, read the current API or chosen SDK page and the
|
||||
question guidance relevant to the design. For a new workflow, also inspect the
|
||||
closest cookbook: it often shows a better decomposition than a generic classifier.
|
||||
- If the index is unavailable, use the direct links below or the site's navigation.
|
||||
If Markdown fetching fails, try the normal page. If live access is unavailable,
|
||||
use available local docs or installed SDK types, state that limitation, and avoid
|
||||
inventing version-dependent details.
|
||||
|
||||
| Task | Start here; follow the relevant details |
|
||||
| --- | --- |
|
||||
| Understand the programming model | [System One](https://docs.typesafe.ai/concepts/system-one.md), [building guide](https://docs.typesafe.ai/concepts/how-to-build-with-system-one.md) |
|
||||
| Explore what to build | [Use-case map](https://docs.typesafe.ai/concepts/use-case-map.md), then relevant cookbooks from the index |
|
||||
| Prepare inputs and questions | [State](https://docs.typesafe.ai/concepts/state.md), [primitives](https://docs.typesafe.ai/primitives.md), then the chosen primitive's page |
|
||||
| Decide how to handle uncertainty | [Confidence](https://docs.typesafe.ai/confidence.md) |
|
||||
| Write API code | [HTTP API](https://docs.typesafe.ai/api.md), [Python SDK](https://docs.typesafe.ai/sdk/python.md), or [JavaScript SDK](https://docs.typesafe.ai/sdk/javascript.md) |
|
||||
| Update an older integration | [Migration guide](https://docs.typesafe.ai/migrating-to-v1.md) and the installed SDK's current reference |
|
||||
|
||||
## Find the useful shape
|
||||
|
||||
Start from the behavior the user wants: what will the application show, select,
|
||||
change, or hand off? Work backward to the judgments it needs. Keep known rules,
|
||||
calculations, exact lookups, and execution in code. Preserve the user's chosen stack
|
||||
and scope; add TypeSafe where semantic understanding helps.
|
||||
|
||||
When brainstorming or choosing an architecture, consider more than classification.
|
||||
The patterns below are starting points: combine primitives around the user's goal,
|
||||
including ideas that do not fit an established recipe.
|
||||
|
||||
- **Route and fill known arguments.** A request can select a handler and its typed
|
||||
parameters. Ask useful branch-specific questions up front and consume only the
|
||||
relevant answers. Explore [function calling](https://docs.typesafe.ai/cookbooks/function_calling.md)
|
||||
and [speculative fan-out](https://docs.typesafe.ai/patterns/fan-out.md).
|
||||
- **Select instead of generate.** Find candidate values or source spans in code,
|
||||
use a judgment to select the intended one, then copy or normalize it. Code can
|
||||
also assemble source text into a formatted document or reading guide. Explore
|
||||
[value extraction](https://docs.typesafe.ai/cookbooks/pre_parsed_value_extraction_cookbook.md)
|
||||
and [structure recovery](https://docs.typesafe.ai/cookbooks/autoformat.md).
|
||||
- **Find and judge evidence.** Retrieve candidates, compare their relevance to a
|
||||
query, and select useful context. Explore [reranking](https://docs.typesafe.ai/cookbooks/rerank_typesafe.md)
|
||||
and [hierarchical classification](https://docs.typesafe.ai/cookbooks/hierarchical_classification.md).
|
||||
- **Turn judgments into reusable data.** Score dimensions once, then let code or
|
||||
user controls change weights, thresholds, rankings, and views. With labeled
|
||||
outcomes, those signals can become classical ML features. Explore
|
||||
[composite scoring](https://docs.typesafe.ai/patterns/composite-scoring.md) and
|
||||
[feature discovery](https://docs.typesafe.ai/cookbooks/autoresearch_feature_discovery.md).
|
||||
- **Verify and escalate.** Check specific claims or fields against their evidence;
|
||||
send uncertain or failing cases to a person or reasoning model. Explore
|
||||
[citation checks](https://docs.typesafe.ai/cookbooks/citation_check.md) and
|
||||
[extraction cascades](https://docs.typesafe.ai/cookbooks/sde_cascade.md).
|
||||
- **Respond to changing state.** Code can retain goals and observations while fresh
|
||||
judgments guide the next bounded step. Keep inferred state distinct from observed
|
||||
facts, and check freshness before applying a result to a changed situation.
|
||||
|
||||
For open-ended requests, offer the few directions that best serve the user's goal
|
||||
and recommend a starting point. For a concrete request, choose the relevant pattern
|
||||
and build; a brainstorm is not a mandatory detour.
|
||||
|
||||
## Design the judgments
|
||||
|
||||
Choose by what the answer means, then read the relevant primitive page:
|
||||
|
||||
| Need | Primitive | Important distinction |
|
||||
| --- | --- | --- |
|
||||
| One of a defined set | [Choice](https://docs.typesafe.ai/primitives/choice.md) | Picks one option; its distribution compares competing options |
|
||||
| Whether a condition holds | [Noul](https://docs.typesafe.ai/primitives/noul.md) | Probability of yes; no separate confidence; use one per label when several may apply |
|
||||
| Degree along a described dimension | [Score](https://docs.typesafe.ai/primitives/score.md) | Probability-weighted position on ordered levels; use comparable per-item Scores for graded ranking |
|
||||
|
||||
Give each question enough relevant **state** to answer: source text, identities,
|
||||
relationships, policies, and current facts. Prefer named JSON fields when context
|
||||
has several parts. Put the judgment in **instructions** and define its possible
|
||||
answers in **criteria**. Question IDs are for code and are not sent to the model;
|
||||
include complete meaning in the question. Reference nested state with backticked
|
||||
paths such as `ticket.messages[0].text`.
|
||||
|
||||
Ask one narrow, coherent judgment per question. Split independently useful dimensions,
|
||||
without destroying the relationship being judged. A bounded action selection or
|
||||
contextual interpretation is valid; atomic does not mean literal fact extraction
|
||||
or a one-sentence limit. Strings work for simple questions. Use structured objects
|
||||
or arrays when definitions, contrasts, exclusions, or examples clarify instructions
|
||||
or criteria. Score levels must describe concrete situations and stand on their own.
|
||||
|
||||
Keep the needed answers available. Include a no-match outcome when nothing may fit;
|
||||
use a separate presence judgment when it is independently useful. For source-value
|
||||
selection, check candidate coverage: the model cannot choose an omitted value.
|
||||
|
||||
## Compose and verify
|
||||
|
||||
**Ask independent questions over the same state together**, including useful
|
||||
speculative questions. They run in parallel and cannot see one another's answers.
|
||||
State each speculative premise explicitly; code consumes the applicable answers.
|
||||
A second request is warranted when an earlier answer is needed to fetch evidence,
|
||||
construct new state, or determine the next options. Extra questions still use tokens;
|
||||
measure actual request budgets, cost, and end-to-end latency.
|
||||
|
||||
Use probabilities and confidence to guide behavior, with thresholds evaluated on
|
||||
the user's data and consequences. Choice/Score confidence summarizes distribution
|
||||
concentration, not overall workflow correctness or permission to act. A Noul near
|
||||
0.5 means similar probability for yes and no, not medium intensity. Several
|
||||
acceptable alternatives can also spread probability; low confidence need not
|
||||
invalidate a harmless preference choice. Ignore uncertainty on unused branches.
|
||||
|
||||
Keep policy explicit and raw judgments reusable. Weighted scores suit compensating
|
||||
preferences; an “any serious violation” rule needs separate conditions. Changing a
|
||||
weight or display filter need not rerun inference when evidence and question meanings
|
||||
are unchanged. Typed output guarantees the interface, not truth. System One models
|
||||
are trained for calibrated decisions; validate their performance in the target domain.
|
||||
|
||||
Test representative cases and the resulting application behavior. For failures,
|
||||
inspect the exact state, questions, candidates, answers, composition, and observed
|
||||
outcome. Separate missing evidence, model errors, code errors, and service failures.
|
||||
Treat cookbook thresholds and demo results as examples to evaluate, not universal
|
||||
rules or permanent model limitations. Keep API credentials server-side in web apps.
|
||||
@@ -1 +0,0 @@
|
||||
../../.agents/skills/typesafe-ai
|
||||
3
.github/workflows/build.yml
vendored
3
.github/workflows/build.yml
vendored
@@ -6,7 +6,7 @@ on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
require_complete:
|
||||
description: Fail unless 43U code, data, functions, units, and links are all 100%
|
||||
description: Fail unless 43U binary matches completely and source inventory is complete
|
||||
required: false
|
||||
default: false
|
||||
type: boolean
|
||||
@@ -79,6 +79,7 @@ jobs:
|
||||
python tools/check_decomp_complete.py \
|
||||
build/${{ matrix.version }}/report.json \
|
||||
--dol build/${{ matrix.version }}/main.dol
|
||||
python tools/check_asm_inventory.py
|
||||
|
||||
# Upload map files
|
||||
- name: Upload map
|
||||
|
||||
537
AGENTS.md
537
AGENTS.md
@@ -1,535 +1,26 @@
|
||||
# AGENTS.md
|
||||
|
||||
Guidance for AI agents working in this repository.
|
||||
The Wii Menu 4.3U decompilation is finished: every unit matches and links, and
|
||||
the build reproduces the retail DOL. There is no matching, linking or cleanup
|
||||
work left to continue. Work only on what the user asks for.
|
||||
|
||||
Keep code comments to cases where they are necessary.
|
||||
## Never touch upstream
|
||||
|
||||
## CRITICAL RULE: never touch upstream
|
||||
Do not push to, open pull requests or issues against, or comment on
|
||||
`koopthekoopa/wii-ipl`. Its maintainers do not want AI-authored work. `origin`
|
||||
(`coah80/wii-ipl`) is this fork; `upstream` has its push URL set to
|
||||
`DISABLED_never_push_to_upstream` on purpose. Never pass
|
||||
`--repo koopthekoopa/wii-ipl` to `gh`.
|
||||
|
||||
**Do not open a pull request against `koopthekoopa/wii-ipl`. Do not push to it.
|
||||
Do not open issues on it. Do not comment on it. Never. Not once.**
|
||||
## Keep the build matching
|
||||
|
||||
The upstream maintainers do not want AI-authored commits in their history. This
|
||||
fork exists solely so that AI-assisted matching work has somewhere to live
|
||||
without disturbing them. Breaking this rule is worse than producing no matches
|
||||
at all.
|
||||
|
||||
Concretely:
|
||||
|
||||
- `origin` is this fork, `coah80/wii-ipl`. Only the orchestrator pushes
|
||||
validated leaf branches here.
|
||||
- `upstream` is `koopthekoopa/wii-ipl`. Its push URL is intentionally set to
|
||||
the sentinel `DISABLED_never_push_to_upstream` so an accidental
|
||||
`git push upstream` fails instead of uploading.
|
||||
- Never run `gh pr create` with an upstream base, and never pass
|
||||
`--repo koopthekoopa/wii-ipl` to any `gh` command.
|
||||
- If a task appears to require contacting upstream, stop and ask the human.
|
||||
|
||||
If you are reading this because you are about to open a PR against upstream:
|
||||
don't. PRs for validated leaf branches belong only to this fork.
|
||||
|
||||
## What this repository is
|
||||
|
||||
A matching decompilation of the Wii Menu (system menu) 4.3U. "Matching" means
|
||||
the compiled output must be byte-identical to the original binary, not merely
|
||||
functionally equivalent. Correct behaviour that compiles to different assembly
|
||||
is a failure.
|
||||
|
||||
## Build and verify
|
||||
Any source change must keep the output byte-identical:
|
||||
|
||||
```
|
||||
python3 configure.py --version 43U
|
||||
ninja
|
||||
sha1sum build/43U/main.dol # 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
```
|
||||
|
||||
Ninja lives at `/home/cole/projects/tests/.venv/bin/ninja` in the author's
|
||||
environment.
|
||||
|
||||
The acceptance gate for any change is the DOL hash:
|
||||
|
||||
```
|
||||
build/43U/main.dol -> 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
```
|
||||
|
||||
Objects listed as `NonMatching` in `configure.py` are **not linked** into the
|
||||
DOL. Editing a `NonMatching` translation unit cannot change the DOL hash, which
|
||||
makes it safe to iterate on a partial match without breaking the build. Verify
|
||||
progress against the object file instead of the DOL:
|
||||
|
||||
```
|
||||
build/43U/src/src/<path>.o # what you just built
|
||||
build/43U/obj/src/<path>.o # the original object, ground truth
|
||||
```
|
||||
|
||||
## Tooling for measuring progress
|
||||
|
||||
`objdiff` scores each function:
|
||||
|
||||
```
|
||||
build/tools/objdiff-cli report generate -p . -o report.json -f json
|
||||
```
|
||||
|
||||
A function counts as matched only at `fuzzy_match_percent == 100.0`. Anything
|
||||
below that is not a match, regardless of how good it looks.
|
||||
|
||||
Helper tools live in `tools/decomp-assist/`:
|
||||
|
||||
- `ctxdiff.py <unit> <symbol>` — compact instruction-level diff of one function
|
||||
between your object and the original. This is the main iteration loop.
|
||||
- `disasm_fn.py <object> <symbol>` — disassembly with relocation-resolved call
|
||||
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
|
||||
original, string by string. See below; this is the highest-signal tool.
|
||||
- `export_pyghidra.py` — regenerates `ghidra_decomp.txt`, decompiled C for the
|
||||
functions still missing.
|
||||
|
||||
The final completion assertion is machine-checkable:
|
||||
|
||||
```
|
||||
python3 tools/check_decomp_complete.py build/43U/report.json \
|
||||
--dol build/43U/main.dol
|
||||
```
|
||||
|
||||
It must pass before claiming full completion. GitHub Actions runs the same
|
||||
assertion when manually dispatched with `require_complete=true`.
|
||||
Normal push and pull-request builds publish progress without failing on the
|
||||
current incomplete state. Use the manual `require_complete=true` dispatch for
|
||||
the terminal all-100% gate.
|
||||
|
||||
`tools/test_workflow_guards.py` exercises the completion checker, and
|
||||
`tools/worktree_check.py` validates the main, leaf, and cleanup states before
|
||||
integration.
|
||||
|
||||
## The single most useful finding: the string pool
|
||||
|
||||
MWCC emits a translation unit's string literals into `.data` in the order the
|
||||
compiler encounters them, and the compiler encounters them in **source-token
|
||||
order**, not runtime order. Every later string's offset therefore depends on
|
||||
every earlier one.
|
||||
|
||||
This matters enormously. If a function is missing from a translation unit, or
|
||||
references its strings in a different order than the original, then every
|
||||
string after it lands at the wrong offset, and *every function that reads those
|
||||
strings fails to match* — even functions you have not touched.
|
||||
|
||||
Observable evidence: `TMDFile::Open` sat at 99.92 percent purely because a
|
||||
string several functions earlier was 8 bytes off. Adding the correct
|
||||
`checkContentsNum` block moved it to 99.96 without touching `Open`.
|
||||
|
||||
**Always run `pool_diff.py` and fix the first divergence before tuning register
|
||||
allocation.** It points at exactly which function block is wrong or missing.
|
||||
|
||||
### Which branch you write changes the pool
|
||||
|
||||
Because emission follows source-token order, writing
|
||||
|
||||
```cpp
|
||||
if (cond) { A(); } else { B(); }
|
||||
```
|
||||
|
||||
versus
|
||||
|
||||
```cpp
|
||||
if (!cond) { B(); } else { A(); }
|
||||
```
|
||||
|
||||
emits the strings referenced by `A` and `B` in the opposite order. This is a
|
||||
free lever: if a function's codegen looks right but its strings are swapped,
|
||||
invert the condition rather than restructuring the logic. It fixed both the
|
||||
pool and the instruction stream for `GetValidTicketIndex` in one change.
|
||||
|
||||
### Missing functions must all be present
|
||||
|
||||
A string block cannot be partially correct. A function that is entirely absent
|
||||
leaves a hole, and everything downstream is shifted. Implement functions in
|
||||
**object-order** (the order their addresses appear in `config/43U/symbols.txt`
|
||||
and `splits.txt`), not in whatever order looks convenient.
|
||||
|
||||
## Workflow that produced matches
|
||||
|
||||
1. Find the next missing function in object order.
|
||||
2. Get its decompiled C from `ghidra_decomp.txt` (regenerate with
|
||||
`export_pyghidra.py` if needed).
|
||||
3. Write it as literally as possible: same order of operations, same branch
|
||||
direction, same number of temporaries.
|
||||
4. Insert it at the correct position in the source file.
|
||||
5. Build only that object: `ninja build/43U/src/src/<path>.o`.
|
||||
6. `pool_diff.py` first. Fix ordering divergences before anything else.
|
||||
7. `ctxdiff.py` next. Work through the instruction diff.
|
||||
8. Only then look at register allocation.
|
||||
|
||||
## Subagent and PR workflow
|
||||
|
||||
This repository targets only Wii Menu 4.3U. Do not configure or build 43E,
|
||||
43J, or 43K while doing matching work.
|
||||
|
||||
Most workers should pursue exact matching or safe linking; assign the remainder
|
||||
to decompilation. Keep every worker slot busy (currently four Codex slots; see
|
||||
"Orchestrator loop" below). Fill completed slots with disjoint tasks. Never duplicate a source file or function
|
||||
range. Workers return changed paths, exact objdiff measurements, and validation
|
||||
results. Fuzzy-only results are not accepted.
|
||||
|
||||
Workers must do the work through tool calls and avoid conversational messages.
|
||||
Send findings to the parent only through the collaboration tool, with concise
|
||||
paths, measurements, and validation evidence. Put PR discussion on the PR when
|
||||
needed. Do not send user-facing status chatter; the orchestrator follows the
|
||||
reporting rule below.
|
||||
|
||||
### Worker loop
|
||||
|
||||
Workers iterate until exact-name `objdiff` reports `100.0%`. They must not stop
|
||||
at a fuzzy score, push, open a PR, or merge. A local commit is fine. Compiler
|
||||
tie-breaks should be reported with evidence, not hidden behind artificial
|
||||
assembly or uninitialized values. Exact matching is the handoff point, not
|
||||
acceptance. A candidate is incomplete until every owned code and data section
|
||||
and its link metrics are 100%; matching a few functions alone is not enough.
|
||||
Write new matches as readable C or C++ and keep new inline assembly out of the
|
||||
source unless the existing target structure makes it unavoidable.
|
||||
|
||||
Worker measurements are advisory. Only a fresh orchestrator verification can
|
||||
accept, push, open, or merge a candidate. Workers are persistent across
|
||||
validation. After reaching a candidate result,
|
||||
the worker enters a paused or awaiting-parent state while the orchestrator
|
||||
performs its checks. Keep the worker handle and its leaf assignment alive. If
|
||||
pool, ctxdiff, source review, or any other gate fails, send the failure evidence
|
||||
back to that same worker and resume it on the same leaf. Do not discard a
|
||||
near-match and silently replace it with a new worker. A worker may be closed
|
||||
only after its leaf is accepted, explicitly abandoned, or the orchestrator is
|
||||
stopping the entire goal. A wait timeout is not worker termination; poll the
|
||||
same handle or inspect its authoritative status before taking recovery action.
|
||||
|
||||
The orchestrator must independently rebuild the owned object and verify:
|
||||
|
||||
1. `pool_diff.py` reports identical pools, with no first divergence.
|
||||
2. Exact-name `objdiff` reports `100.0%` for the requested symbol.
|
||||
3. `ctxdiff.py` reports `diffs 0` and identical instruction counts.
|
||||
4. Unit-level code, data, function, and link measures for the owned range are
|
||||
100%, including every owned section.
|
||||
5. The focused source diff is minimal, readable, and free of artificial
|
||||
assembly, uninitialized values, or unrelated edits.
|
||||
6. The full 4.3U build passes and `build/43U/main.dol` has SHA1
|
||||
`26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
If any orchestrator gate fails, do not promote, push, open a PR, or merge the
|
||||
candidate. Restore it or send the same disjoint task back to its worker with
|
||||
the failing evidence. Stage the candidate branch for a PR only after every
|
||||
gate passes, then regenerate the live progress report before accepting the
|
||||
next candidate.
|
||||
|
||||
For each candidate, the worker must:
|
||||
|
||||
1. Run `pool_diff.py` before tuning code generation.
|
||||
2. Build the 43U object with `/home/cole/projects/tests/.venv/bin/ninja -C . build/43U/src/src/<path>.o`.
|
||||
3. Require `objdiff` to report `100.0%` for the function and `ctxdiff.py` to report `diffs 0`.
|
||||
4. Iterate until exact-name objdiff reaches `100.0%`, while preserving the
|
||||
pool and source-quality requirements above.
|
||||
5. Return the focused exact match to the parent agent for review. The parent
|
||||
reruns every gate, runs `tools/decomp_status.py` and
|
||||
`tools/check_decomp_complete.py`, and runs `/home/cole/projects/tests/.venv/bin/ninja -C . build/43U/ok`;
|
||||
the worker does not push, open a PR, or merge.
|
||||
|
||||
The main agent reviews every worker result before accepting it. After each
|
||||
accepted merge, record the new report from `build/43U/report.json` and keep
|
||||
the DOL hash at `26116613f624061ba99c8d1a299aaa6efa85670d`. Never push to
|
||||
`upstream`; only the fork's `origin` is in scope.
|
||||
|
||||
### Orchestrator ownership boundary
|
||||
|
||||
The orchestrator does not perform decompilation or hand-tune worker source.
|
||||
All source-level reverse engineering, implementation, compiler experiments,
|
||||
and match iteration belong to the persistent subagents. The orchestrator may
|
||||
only select disjoint leaves, start and pause workers, resume a worker with
|
||||
failure evidence, run independent verification commands, review diffs, record
|
||||
wave state, commit validated leaf-branch changes, push the leaf branch, open
|
||||
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
|
||||
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
|
||||
remote branch, and dispatching the worker pool. The parent must not claim a
|
||||
match without fresh independent verification.
|
||||
|
||||
### Worktrees, branches, and PR integration
|
||||
|
||||
Every leaf gets its own worktree and branch created from the latest
|
||||
`origin/main`, for example `agent/<wave>/<leaf>`. No two workers may share a
|
||||
worktree, branch, or source file. A worker may commit locally on its leaf branch
|
||||
if that is needed to preserve its exact result, but it must not push, open a PR,
|
||||
or merge.
|
||||
|
||||
Use the repository worktree checker before integration and cleanup:
|
||||
|
||||
```
|
||||
python3 tools/worktree_check.py main --synced
|
||||
python3 tools/worktree_check.py leaf <leaf-worktree> agent/<wave>/<leaf>
|
||||
python3 tools/worktree_check.py cleanup <leaf-worktree> agent/<wave>/<leaf>
|
||||
```
|
||||
|
||||
The cleanup check is read-only. It succeeds only for a clean leaf branch that
|
||||
is already an ancestor of `origin/main`; the orchestrator then performs the
|
||||
explicit `git worktree remove` and local branch deletion.
|
||||
|
||||
After the worker reaches its handoff point, the orchestrator validates the
|
||||
worker's worktree from a fresh build. If every gate passes, the orchestrator
|
||||
pushes that leaf branch to the fork, opens a PR against `coah80/wii-ipl:main`,
|
||||
and merges it only after the same gates are recorded in the PR. Never create a
|
||||
PR against `koopthekoopa/wii-ipl`.
|
||||
|
||||
Merge one accepted leaf at a time. After each merge, fetch the new
|
||||
`origin/main`, regenerate progress, and rebase or recreate all not-yet-merged
|
||||
leaf branches before their next validation. Re-run objdiff, pool, ctxdiff, the
|
||||
full build, and the DOL hash after rebasing. The PR itself is not acceptance;
|
||||
the post-merge main branch is the authority.
|
||||
|
||||
The orchestrator may resolve mechanical branch conflicts such as unchanged
|
||||
context or generated bookkeeping. It must not resolve a semantic source
|
||||
conflict by inventing decompilation. Send semantic conflicts back to the same
|
||||
leaf worker, resume it in its worktree, and require the full gates again. Keep
|
||||
the worktree and worker handle until the leaf is merged, explicitly abandoned,
|
||||
or the whole goal is stopped; clean them up only after that terminal state.
|
||||
|
||||
After a successful merge:
|
||||
|
||||
1. Confirm the PR is merged into the fork's `main` and the leaf worktree has no
|
||||
uncommitted changes.
|
||||
2. In the integration/main worktree, run `git fetch origin` followed by
|
||||
`git merge --ff-only origin/main` (or an equivalent non-destructive fast
|
||||
forward). Do not use `git reset --hard` or overwrite unrelated user work.
|
||||
3. Re-run the live progress report and the full 4.3U/DOL gates on the updated
|
||||
main branch.
|
||||
4. Rebase each still-active leaf branch onto the new `origin/main` in its own
|
||||
worktree, resolve only mechanical conflicts centrally, and send semantic
|
||||
conflicts back to that leaf's worker.
|
||||
5. Only after the leaf is merged, clean, and no longer needed, remove its
|
||||
worktree and local branch. A failed or conflicted leaf keeps its worktree
|
||||
and worker alive.
|
||||
|
||||
### User-facing progress reports
|
||||
|
||||
Keep user-facing messages to a minimum and use as few tokens as possible.
|
||||
Do not send routine status updates or commentary while workers are running or
|
||||
PRs are open. After each matching-work PR is merged and the live progress
|
||||
report has been regenerated, send only the current linked, fuzzy, and data
|
||||
percentages in this format:
|
||||
|
||||
```
|
||||
Linked: <percent> | Fuzzy: <percent> | Data: <percent>
|
||||
```
|
||||
|
||||
Do not report stale values, unmerged PR results, or add other text to that
|
||||
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
|
||||
|
||||
The decompilation loop does not stop after a successful wave, a convenient
|
||||
near-match, or a code-only milestone. Keep dispatching and resuming workers
|
||||
until the live 43U report proves all of the following:
|
||||
|
||||
- Code is 100.00% exact-matched, not merely fuzzy-matched.
|
||||
- Code is 100.00% fully linked, with no remaining unlinked code units.
|
||||
- Data is 100.00% extracted/decompiled and 100.00% fully linked.
|
||||
- Every source unit and function in the 4.3U target is accounted for; no
|
||||
`NonMatching`, missing, fuzzy-only, or unlinked unit remains.
|
||||
- The final full build passes, the DOL hash remains correct, and the report,
|
||||
object files, and linked DOL agree.
|
||||
|
||||
Until every condition is true and independently verified, the goal remains
|
||||
active. A worker wave with zero accepted matches is a failed attempt, not a
|
||||
completion condition; preserve useful workers, resume fixable leaves, and
|
||||
dispatch the next disjoint batch.
|
||||
|
||||
## Things that do NOT work
|
||||
|
||||
- **Frame pragmas.** `#pragma ppc_iro_level 0` fixed exactly one function out
|
||||
of roughly forty attempts and made others worse. A search across pragma
|
||||
variants produced almost no movement. Do not spend time here.
|
||||
- **Reverting to pristine upstream to unblock.** The unmodified upstream tree
|
||||
is needed as a baseline, but it does not help you match anything.
|
||||
- **Searching other forks for the missing functions.** The eleven unimplemented
|
||||
`iplESMisc` functions do not exist in any of the twenty-three public forks.
|
||||
|
||||
## Known hard cases
|
||||
|
||||
Many remaining diffs are pure compiler tie-breaks — register allocation and
|
||||
floating-point scheduling — with no source-level lever. If `ctxdiff.py` shows
|
||||
the instruction count already matches and the surviving differences are
|
||||
callee-saved register names, you are probably looking at a tie-break. Record it
|
||||
and move on rather than thrashing.
|
||||
|
||||
## Current status
|
||||
|
||||
Do not copy a progress number from this file. Regenerate the live 43U report
|
||||
with `ninja -C . progress build/43U/report.json`; the report and DOL hash are
|
||||
the authority for current status. `iplESMisc.cpp` remains `NonMatching` and
|
||||
unlinked, so work there is DOL-safe.
|
||||
|
||||
## Reference
|
||||
|
||||
`tools/decomp-assist/iplESMisc.reference.cpp` is a snapshot of `iplESMisc.cpp`
|
||||
with the matching work applied, kept as a reference for the string order and
|
||||
function layout that the pool depends on.
|
||||
Comments in the source that name a compiler requirement mark code shaped to
|
||||
match the original binary; changing it changes the bytes.
|
||||
|
||||
30
GATES.md
30
GATES.md
@@ -1,30 +0,0 @@
|
||||
# Gates: Wii Menu decompilation progress
|
||||
|
||||
OWNS: src/**, include/**, configure.py, GATES.md
|
||||
|
||||
Scope: raise the 43U Wii Menu code match from the current baseline toward 99 percent while preserving build and matching-object correctness
|
||||
|
||||
- [x] G0: this ledger passes structural lint
|
||||
CHECK: node /home/cole/.agents/skills/unlazy/scripts/gate-lint.mjs GATES.md
|
||||
EXPECT: LINT OK
|
||||
EVIDENCE: LINT OK (2026-09-19)
|
||||
|
||||
- [ ] G1: the measured 43U matched-code percentage reaches 99 percent
|
||||
CHECK: /home/cole/projects/tests/.venv/bin/ninja && build/tools/objdiff-cli report generate -p . -o /tmp/wii-ipl-goal-report.json -f json >/dev/null && python3 -c "import json; x=json.load(open('/tmp/wii-ipl-goal-report.json')); p=float(x['measures']['matched_code_percent']); assert p >= 99.0, p; print('99 percent code match passed: %.6f' % p)"
|
||||
EXPECT: 99 percent code match passed
|
||||
EVIDENCE: 57.463276 percent, 1721124 / 2995172 code bytes, 8736 / 12563 functions (2026-09-19); threshold not reached
|
||||
|
||||
- [x] G2: the complete 43U build succeeds after each matching change
|
||||
CHECK: python3 configure.py --version 43U && /home/cole/projects/tests/.venv/bin/ninja && test -s build/43U/main.dol && echo 'full 43U build passed'
|
||||
EXPECT: full 43U build passed
|
||||
EVIDENCE: full 43U build passed after ipl::scene::ChannelTitle::draw match (2026-09-19)
|
||||
|
||||
- [x] G3: existing matching objects remain byte-identical to the original DOL
|
||||
CHECK: python3 -c "import hashlib; p='build/43U/main.dol'; h=hashlib.sha1(open(p,'rb').read()).hexdigest(); assert h=='26116613f624061ba99c8d1a299aaa6efa85670d', h; print('baseline DOL hash passed')"
|
||||
EXPECT: baseline DOL hash passed
|
||||
EVIDENCE: baseline DOL SHA-1 26116613f624061ba99c8d1a299aaa6efa85670d (2026-09-19)
|
||||
|
||||
- [x] G4: the final working tree has no whitespace errors
|
||||
CHECK: git diff --check && echo 'diff check passed'
|
||||
EXPECT: diff check passed
|
||||
EVIDENCE: diff check passed (2026-09-19)
|
||||
@@ -2,8 +2,8 @@
|
||||
>
|
||||
> original doesnt like ai commits, so im forking to not disturb them. :)
|
||||
>
|
||||
> This is a personal fork for AI-assisted matching work. No pull requests are
|
||||
> opened against upstream, ever. See [AGENTS.md](AGENTS.md).
|
||||
> This is a personal fork for AI-assisted matching work. The 4.3U decompilation
|
||||
> is complete. No pull requests are opened against upstream, ever.
|
||||
|
||||
<!--- Github Actions Badge -->
|
||||
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2026 TypeSafe AI
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
@@ -1,148 +0,0 @@
|
||||
---
|
||||
name: typesafe-ai
|
||||
description: >
|
||||
Build AI-powered software with TypeSafe: small units of AI intelligence you
|
||||
can use like programming primitives. Its System One models, including Jev,
|
||||
turn natural language and application state into typed judgments and
|
||||
probabilities that code can combine. Use when a feature needs programmable
|
||||
common sense, when brainstorming what AI could make possible in an app, or
|
||||
when an LLM prompt-and-parse step could become a structured decision.
|
||||
Applications include routing, ranking, extraction, verification, and
|
||||
interactive experiences; these are starting points, not the limits. Read live
|
||||
docs and cookbooks to find useful patterns and discover new combinations.
|
||||
license: MIT
|
||||
---
|
||||
# Build with TypeSafe
|
||||
|
||||
TypeSafe makes units of AI intelligence usable like programming primitives: small
|
||||
judgments you can compose into larger capabilities. Its **System One models** return
|
||||
fast, focused judgments that software can consume directly. **Jev** is TypeSafe's
|
||||
flagship and first System One model. It understands natural language and returns
|
||||
typed answers and probabilities rather
|
||||
than generating text or reasoning explanations. Code owns the workflow; the model
|
||||
supplies programmable common sense where ordinary code needs semantic understanding.
|
||||
|
||||
## Read the live docs
|
||||
|
||||
**The live TypeSafe docs are the source of truth. Read them as part of the task.**
|
||||
This skill gives direction; the docs carry current concepts, prompting guidance,
|
||||
API contracts, SDK usage, models, limits, and worked examples.
|
||||
|
||||
- Start with the [documentation index](https://docs.typesafe.ai/llms.txt) to discover
|
||||
relevant pages and cookbooks. Use targeted reads rather than loading the entire site.
|
||||
- Mintlify serves Markdown by appending `.md` to a page path, for example
|
||||
[how to build with TypeSafe](https://docs.typesafe.ai/concepts/how-to-build-with-system-one.md).
|
||||
Follow links from the index; convert extensionless documentation page links to
|
||||
`.md` when useful. Resolve relative links against `https://docs.typesafe.ai`.
|
||||
- Before writing an integration, read the current API or chosen SDK page and the
|
||||
question guidance relevant to the design. For a new workflow, also inspect the
|
||||
closest cookbook: it often shows a better decomposition than a generic classifier.
|
||||
- If the index is unavailable, use the direct links below or the site's navigation.
|
||||
If Markdown fetching fails, try the normal page. If live access is unavailable,
|
||||
use available local docs or installed SDK types, state that limitation, and avoid
|
||||
inventing version-dependent details.
|
||||
|
||||
| Task | Start here; follow the relevant details |
|
||||
| --- | --- |
|
||||
| Understand the programming model | [System One](https://docs.typesafe.ai/concepts/system-one.md), [building guide](https://docs.typesafe.ai/concepts/how-to-build-with-system-one.md) |
|
||||
| Explore what to build | [Use-case map](https://docs.typesafe.ai/concepts/use-case-map.md), then relevant cookbooks from the index |
|
||||
| Prepare inputs and questions | [State](https://docs.typesafe.ai/concepts/state.md), [primitives](https://docs.typesafe.ai/primitives.md), then the chosen primitive's page |
|
||||
| Decide how to handle uncertainty | [Confidence](https://docs.typesafe.ai/confidence.md) |
|
||||
| Write API code | [HTTP API](https://docs.typesafe.ai/api.md), [Python SDK](https://docs.typesafe.ai/sdk/python.md), or [JavaScript SDK](https://docs.typesafe.ai/sdk/javascript.md) |
|
||||
| Update an older integration | [Migration guide](https://docs.typesafe.ai/migrating-to-v1.md) and the installed SDK's current reference |
|
||||
|
||||
## Find the useful shape
|
||||
|
||||
Start from the behavior the user wants: what will the application show, select,
|
||||
change, or hand off? Work backward to the judgments it needs. Keep known rules,
|
||||
calculations, exact lookups, and execution in code. Preserve the user's chosen stack
|
||||
and scope; add TypeSafe where semantic understanding helps.
|
||||
|
||||
When brainstorming or choosing an architecture, consider more than classification.
|
||||
The patterns below are starting points: combine primitives around the user's goal,
|
||||
including ideas that do not fit an established recipe.
|
||||
|
||||
- **Route and fill known arguments.** A request can select a handler and its typed
|
||||
parameters. Ask useful branch-specific questions up front and consume only the
|
||||
relevant answers. Explore [function calling](https://docs.typesafe.ai/cookbooks/function_calling.md)
|
||||
and [speculative fan-out](https://docs.typesafe.ai/patterns/fan-out.md).
|
||||
- **Select instead of generate.** Find candidate values or source spans in code,
|
||||
use a judgment to select the intended one, then copy or normalize it. Code can
|
||||
also assemble source text into a formatted document or reading guide. Explore
|
||||
[value extraction](https://docs.typesafe.ai/cookbooks/pre_parsed_value_extraction_cookbook.md)
|
||||
and [structure recovery](https://docs.typesafe.ai/cookbooks/autoformat.md).
|
||||
- **Find and judge evidence.** Retrieve candidates, compare their relevance to a
|
||||
query, and select useful context. Explore [reranking](https://docs.typesafe.ai/cookbooks/rerank_typesafe.md)
|
||||
and [hierarchical classification](https://docs.typesafe.ai/cookbooks/hierarchical_classification.md).
|
||||
- **Turn judgments into reusable data.** Score dimensions once, then let code or
|
||||
user controls change weights, thresholds, rankings, and views. With labeled
|
||||
outcomes, those signals can become classical ML features. Explore
|
||||
[composite scoring](https://docs.typesafe.ai/patterns/composite-scoring.md) and
|
||||
[feature discovery](https://docs.typesafe.ai/cookbooks/autoresearch_feature_discovery.md).
|
||||
- **Verify and escalate.** Check specific claims or fields against their evidence;
|
||||
send uncertain or failing cases to a person or reasoning model. Explore
|
||||
[citation checks](https://docs.typesafe.ai/cookbooks/citation_check.md) and
|
||||
[extraction cascades](https://docs.typesafe.ai/cookbooks/sde_cascade.md).
|
||||
- **Respond to changing state.** Code can retain goals and observations while fresh
|
||||
judgments guide the next bounded step. Keep inferred state distinct from observed
|
||||
facts, and check freshness before applying a result to a changed situation.
|
||||
|
||||
For open-ended requests, offer the few directions that best serve the user's goal
|
||||
and recommend a starting point. For a concrete request, choose the relevant pattern
|
||||
and build; a brainstorm is not a mandatory detour.
|
||||
|
||||
## Design the judgments
|
||||
|
||||
Choose by what the answer means, then read the relevant primitive page:
|
||||
|
||||
| Need | Primitive | Important distinction |
|
||||
| --- | --- | --- |
|
||||
| One of a defined set | [Choice](https://docs.typesafe.ai/primitives/choice.md) | Picks one option; its distribution compares competing options |
|
||||
| Whether a condition holds | [Noul](https://docs.typesafe.ai/primitives/noul.md) | Probability of yes; no separate confidence; use one per label when several may apply |
|
||||
| Degree along a described dimension | [Score](https://docs.typesafe.ai/primitives/score.md) | Probability-weighted position on ordered levels; use comparable per-item Scores for graded ranking |
|
||||
|
||||
Give each question enough relevant **state** to answer: source text, identities,
|
||||
relationships, policies, and current facts. Prefer named JSON fields when context
|
||||
has several parts. Put the judgment in **instructions** and define its possible
|
||||
answers in **criteria**. Question IDs are for code and are not sent to the model;
|
||||
include complete meaning in the question. Reference nested state with backticked
|
||||
paths such as `ticket.messages[0].text`.
|
||||
|
||||
Ask one narrow, coherent judgment per question. Split independently useful dimensions,
|
||||
without destroying the relationship being judged. A bounded action selection or
|
||||
contextual interpretation is valid; atomic does not mean literal fact extraction
|
||||
or a one-sentence limit. Strings work for simple questions. Use structured objects
|
||||
or arrays when definitions, contrasts, exclusions, or examples clarify instructions
|
||||
or criteria. Score levels must describe concrete situations and stand on their own.
|
||||
|
||||
Keep the needed answers available. Include a no-match outcome when nothing may fit;
|
||||
use a separate presence judgment when it is independently useful. For source-value
|
||||
selection, check candidate coverage: the model cannot choose an omitted value.
|
||||
|
||||
## Compose and verify
|
||||
|
||||
**Ask independent questions over the same state together**, including useful
|
||||
speculative questions. They run in parallel and cannot see one another's answers.
|
||||
State each speculative premise explicitly; code consumes the applicable answers.
|
||||
A second request is warranted when an earlier answer is needed to fetch evidence,
|
||||
construct new state, or determine the next options. Extra questions still use tokens;
|
||||
measure actual request budgets, cost, and end-to-end latency.
|
||||
|
||||
Use probabilities and confidence to guide behavior, with thresholds evaluated on
|
||||
the user's data and consequences. Choice/Score confidence summarizes distribution
|
||||
concentration, not overall workflow correctness or permission to act. A Noul near
|
||||
0.5 means similar probability for yes and no, not medium intensity. Several
|
||||
acceptable alternatives can also spread probability; low confidence need not
|
||||
invalidate a harmless preference choice. Ignore uncertainty on unused branches.
|
||||
|
||||
Keep policy explicit and raw judgments reusable. Weighted scores suit compensating
|
||||
preferences; an “any serious violation” rule needs separate conditions. Changing a
|
||||
weight or display filter need not rerun inference when evidence and question meanings
|
||||
are unchanged. Typed output guarantees the interface, not truth. System One models
|
||||
are trained for calibrated decisions; validate their performance in the target domain.
|
||||
|
||||
Test representative cases and the resulting application behavior. For failures,
|
||||
inspect the exact state, questions, candidates, answers, composition, and observed
|
||||
outcome. Separate missing evidence, model errors, code errors, and service failures.
|
||||
Treat cookbook thresholds and demo results as examples to evaluate, not universal
|
||||
rules or permanent model limitations. Keep API credentials server-side in web apps.
|
||||
@@ -1,293 +0,0 @@
|
||||
# sol-med matching attempts
|
||||
|
||||
ATERM pool was identical before iteration. Initial gate: 3/26 instruction-exact, code 72/19204, data 18440/18864, no regressions.
|
||||
|
||||
ATERM_814021BC: (1) combined network settings and access-point name, moved member-pointer initialization after clears, bottom-tested host loop: 153/154 instructions, register and addressing differences; (2) aligned the name member and explicit settings pointer: same instruction count and differences; (3) initialized IP pointer before clear: no improvement. Restored original to avoid unrelated aggregate changes.
|
||||
ATERM_81402424: (1) aligned scan parameters to 32, swapped message/buffer declarations, preserved scan exit result test: 210/210, three condition-register differences; (2) tested scan result != retry error: one branch difference; (3) tested scan result == retry error: 210/210, diffs 0. Retained.
|
||||
ATERM_8140276C: (1) initialized previous record cursor before outer loop, reset at outer tail, separated result flag, scoped AOSS flags: 174/174, 31 register differences; (2) reordered result/found declarations and scoped previous index: 174/174, 27 register differences. Further experiments below.
|
||||
ATERM_81403614: (1) switch over hex character ranges, signed index and indexed output: 49/49, two division differences; (2) explicit signed truncation for index/2: one operand-order difference; (3) reversed addition operands: diffs 0. Retained.
|
||||
ATERMi_AutoConfigThread: (1) real three-field progress object and conditional terminal state: 39/40 instructions; (2) signed equality mask: 40/40, three scheduling/register differences; (3) read progress result before deadline assignment: eight differences. Further experiments below.
|
||||
ATERMi_ApConfigStart: (1) inclusive state bounds, use stored stack size and callback: 103/103, twelve differences; (2) restore source order of global initialization: six clock-register differences. Further experiments below.
|
||||
ATERMi_ApConfigEnd: (1) capture initial state only inside active-thread branch, swap message declarations, compute 500ms alarm instead of reciprocal literal: 125/129 instructions, frame/scheduling differences. Further experiments below.
|
||||
ATERMi_ApConfigGetState: (1) reciprocal first in multiply-high: four register differences; (2) load bus clock in multiply expression: unchanged; (3) direct time conversion expression: unchanged. Restored original, 35/35 instructions with three register differences.
|
||||
|
||||
ATERM_8140276C initial 99.166664%
|
||||
- previous cursor declaration before current cursor: 99.5115%; src 0x2b8 base 0x2b8 insns 174/174; diffs 15: [8, 9, 82, 84, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97]; 8 M addi r27, r4, 4; B addi r31, r3, 4
|
||||
- signed record indices: 99.166664%; src 0x2b8 base 0x2b8 insns 174/174; diffs 27: [8, 9, 18, 29, 34, 41, 50, 54, 55, 60, 61, 68, 74, 75, 82, 84, 87, 88, 89, 90]; 8 M addi r27, r3, 4; B addi r31, r3, 4
|
||||
- AOSS flags initialized after clear: 99.54023%; src 0x2b8 base 0x2b8 insns 174/174; diffs 14: [8, 9, 18, 29, 34, 41, 50, 54, 55, 60, 61, 68, 74, 75]; 8 M addi r27, r3, 4; B addi r31, r3, 4
|
||||
Retained original
|
||||
|
||||
ATERM_81402A24 initial 72.47529%
|
||||
- record capacity includes final descriptor: 71.30038%; src 0x3d4 base 0x41c insns 245/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- allocate nullable buffers before handling failure: 72.380226%; src 0x3cc base 0x41c insns 243/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- multiply-high tick conversion: 75.76426%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81402E40 initial 99.791664%
|
||||
- payload clear through byte alias: 99.791664%; src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
- natural checksum loop: 65.208336%; src 0x108 base 0x180 insns 66/96; --- replace mine 5:12 base 5:12; M 5 mr r28, r5; M 6 mr r26, r3
|
||||
- end length as packet byte extent: 95.572914%; src 0x180 base 0x180 insns 96/96; diffs 6: [9, 10, 42, 44, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
Retained original
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- full-width checksum accumulator: 64.76296%; src 0x20c base 0x21c insns 131/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
- bottom-tested option loop: compile failed
|
||||
- early return for bad checksum: 66.94074%; src 0x20c base 0x21c insns 131/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained original
|
||||
|
||||
ATERM_814031DC initial 85.7218%
|
||||
- MAC text uses equal-sized buffers: 85.766914%; src 0x1f4 base 0x214 insns 125/133; --- replace mine 47:48 base 47:48; M 47 beq 288; B 47 beq 320
|
||||
- nibble conversion advances output cursor: 84.293236%; src 0x204 base 0x214 insns 129/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1)
|
||||
- inclusive digit bound and pointer-based MAC scan: 85.90225%; src 0x1f4 base 0x214 insns 125/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_814033F0 initial 65.868614%
|
||||
- option fields retain converted word width: 67.39416%; src 0x214 base 0x224 insns 133/137; --- replace mine 5:6 base 5:6; M 5 addi r30, r3, 8; B 5 addi r29, r3, 8
|
||||
- bottom-tested parser dispatch: 65.79562%; src 0x21c base 0x224 insns 135/137; --- replace mine 5:6 base 5:6; M 5 addi r28, r3, 8; B 5 addi r29, r3, 8
|
||||
- signed nibble comparisons: 65.32117%; src 0x21c base 0x224 insns 135/137; --- insert mine 7:7 base 7:8; B 7 li r24, 0; --- replace mine 10:29 base 11:17
|
||||
Retained original
|
||||
|
||||
ATERM_814036D8 initial 73.92742%
|
||||
- security switch matches original decision tree: 85.22581%; src 0x1ec base 0x1f0 insns 123/124; --- replace mine 14:15 base 14:15; M 14 beq 340; B 14 beq 344
|
||||
- key text passed through one cursor: 87.0%; src 0x1e4 base 0x1f0 insns 121/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0
|
||||
- counted loop over key records: 73.92742%; src 0x1e0 base 0x1f0 insns 120/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0
|
||||
Retained original
|
||||
|
||||
ATERM_814038C8 initial 35.28917%
|
||||
- one-shot 500ms wait replaces repeated alarm: 35.700314%; src 0x788 base 0xedc insns 482/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
- bottom-tested state machine and wait buffer order: 35.288116%; src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
- progress uses semantic structure: 35.28917%; src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81404844 initial 19.615385%
|
||||
- signed RFC3394 counters: 16.34188%; src 0x1a0 base 0x1d4 insns 104/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1)
|
||||
- counter represented as big-endian bytes: compile failed
|
||||
- RFC3394 initial value and block output order: 18.264957%; src 0x1b0 base 0x1d4 insns 108/117; --- replace mine 6:9 base 6:13; M 6 mr r27, r3; M 7 mr r20, r4
|
||||
Retained original
|
||||
|
||||
ATERM_81404A18 initial 51.107437%
|
||||
|
||||
ATERM_81404844 initial 19.615385%
|
||||
- signed RFC3394 counters: 16.34188%; src 0x1a0 base 0x1d4 insns 104/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1)
|
||||
|
||||
ATERM_81404844 initial 16.34188%
|
||||
- signed RFC3394 counters: 16.34188%; src 0x1a0 base 0x1d4 insns 104/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1)
|
||||
- counter represented as big-endian bytes: compile failed
|
||||
- RFC3394 initial value and block output order: 18.264957%; src 0x1b0 base 0x1d4 insns 108/117; --- replace mine 6:9 base 6:13; M 6 mr r27, r3; M 7 mr r20, r4
|
||||
Retained original
|
||||
|
||||
ATERM_81404A18 initial 51.107437%
|
||||
- signed RFC3394 counters: 52.05785%; src 0x1c8 base 0x1e4 insns 114/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x1a0(r1)
|
||||
- counter represented as big-endian bytes: compile failed
|
||||
- RFC3394 initial value and block output order: 54.991737%; src 0x1c4 base 0x1e4 insns 113/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x190(r1); B 0 stwu r1, -0x1a0(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81404BFC initial 36.869404%
|
||||
- AES byte assembly uses XOR instead of OR: 37.063435%; src 0x400 base 0x430 insns 256/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
- key schedule reads preceding round and chains fourth key word: 36.925373%; src 0x3dc base 0x430 insns 247/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
- signed round count drives key expansion termination: 49.21642%; src 0x3e0 base 0x430 insns 248/268; --- replace mine 0:3 base 0:47; M 0 lbz r8, 1(r4); M 1 cmplwi r5, 0x80
|
||||
Retained original
|
||||
|
||||
ATERM_8140502C initial 35.666668%
|
||||
- interleaved key-word swaps: 42.355072%; src 0x280 base 0x228 insns 160/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
- signed indexed round reversal: 38.746376%; src 0x290 base 0x228 insns 164/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
- counted transformation loop: 11.731884%; src 0x288 base 0x228 insns 162/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
Retained original
|
||||
|
||||
ATERM_81405254 initial 30.464945%
|
||||
- AES byte assembly uses XOR: 34.23247%; src 0x3c4 base 0x43c insns 241/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- two-round loop with final round exit: compile failed
|
||||
- signed round count with separately combined key XOR: compile failed
|
||||
Retained original
|
||||
|
||||
ATERM_81405690 initial 26.601477%
|
||||
- AES byte assembly uses XOR: 34.64945%; src 0x3d4 base 0x43c insns 245/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- two-round loop with final round exit: compile failed
|
||||
- signed round count with separately combined key XOR: compile failed
|
||||
Retained original
|
||||
|
||||
ATERM_81405ACC initial 0%
|
||||
- natural byte copy instead of explicit eight-byte loop: 0%; src 0x10c base 0x240 insns 67/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:12 base 4:10
|
||||
- separate 32-bit count carry updates: 0%; src 0x184 base 0x240 insns 97/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:5 base 4:11
|
||||
- indexed full-block walk retains input length: 0%; src 0x17c base 0x240 insns 95/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:12 base 4:10
|
||||
Retained original
|
||||
|
||||
ATERM_81405D0C initial 32.62639%
|
||||
- decode words with XOR: 25.144444%; src 0xa5c base 0xb40 insns 663/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
- MD5 first-round select expressed as xor mask: 30.945833%; src 0x9fc base 0xb40 insns 639/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
- flat byte-to-word decode loop: 27.13889%; src 0x904 base 0xb40 insns 577/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
Retained original
|
||||
|
||||
ATERMi_AutoConfigThread initial 91.325%
|
||||
- remaining time assigned before terminal state: 91.475%; src 0xa0 base 0xa0 insns 40/40; diffs 7: [20, 22, 23, 26, 28, 29, 30]; 20 M nor r0, r3, r0; B nor r3, r3, r0
|
||||
- terminal mask reuses result variable: 85.075%; src 0xa0 base 0xa0 insns 40/40; diffs 9: [21, 22, 23, 25, 26, 28, 29, 30, 31]; 21 M lwz r4, 0(0); B li r4, -1
|
||||
- state stores preceding deadline store: 85.2%; src 0xa0 base 0xa0 insns 40/40; diffs 8: [21, 22, 23, 25, 26, 29, 30, 31]; 21 M lwz r4, 0(0); B li r4, -1
|
||||
Retained original
|
||||
|
||||
ATERMi_ApConfigStart initial 99.70874%
|
||||
- allocate via stored callback: 99.70874%; src 0x19c base 0x19c insns 103/103; diffs 6: [46, 47, 48, 49, 75, 76]; 46 M lis r31, -0x8000; B lis r30, -0x8000
|
||||
- tick multiplier commutes operands: 97.76699%; src 0x19c base 0x19c insns 103/103; diffs 7: [48, 49, 51, 75, 76, 77, 78]; 48 M lwz r6, 0xf8(r30); B lwz r0, 0xf8(r30)
|
||||
- progress state populated before zeroing result buffer: 90.72816%; src 0x19c base 0x19c insns 103/103; diffs 18: [46, 47, 48, 49, 56, 58, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 75, 76]; 46 M lis r31, -0x8000; B lis r30, -0x8000
|
||||
Retained original
|
||||
|
||||
ATERMi_ApConfigEnd initial 93.94574%
|
||||
- message queues declared within their wait scopes: 91.89922%; src 0x1f4 base 0x204 insns 125/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
- join loop expressed as do-while: 91.54263%; src 0x200 base 0x204 insns 128/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
- time conversion evaluated directly: 93.94574%; src 0x1f4 base 0x204 insns 125/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
Retained original
|
||||
|
||||
ATERM_81404844 initial 19.615385%
|
||||
- big-endian counter union assigned after declarations: 23.931623%; src 0x1a0 base 0x1d4 insns 104/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81404A18 initial 51.107437%
|
||||
- big-endian counter union assigned after declarations: 57.677685%; src 0x1c8 base 0x1e4 insns 114/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x1a0(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81405254 initial 30.464945%
|
||||
- two-round iteration with scoped second round: 25.00369%; src 0x4b8 base 0x43c insns 302/271; --- replace mine 5:42 base 5:230; M 5 lbz r9, 1(r5); M 6 lis r12, 0
|
||||
- signed round index: 30.464945%; src 0x3a4 base 0x43c insns 233/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- round key XOR before table combination: 30.464945%; src 0x3a4 base 0x43c insns 233/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81405690 initial 26.601477%
|
||||
- two-round iteration with scoped second round: 23.239853%; src 0x4d8 base 0x43c insns 310/271; --- replace mine 5:13 base 5:7; M 5 lbz r10, 1(r5); M 6 lis r7, 0
|
||||
- signed round index: 26.601477%; src 0x3b4 base 0x43c insns 237/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- round key XOR before table combination: 26.601477%; src 0x3b4 base 0x43c insns 237/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
Retained original
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- option loop with explicit continuation test: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained original
|
||||
|
||||
ATERM final source retains only exact scan and hex-conversion changes. All unsuccessful experiments restored. Remaining 21 functions are open; their instruction counts and experiment outcomes are recorded above. Cryptographic routines require substantial reconstruction, not just register allocation.
|
||||
|
||||
AOSS initial gate: 7/21 instruction-exact; code 2540/16192; data 3896/3928. String pool identical.
|
||||
AOSS_814001B4: early returns and opcode switch: 75/79, remaining differences are save/restore helper versus individual stores.
|
||||
AOSS_81401BBC: (1) reverse rounding addition: same one operand-order difference; (2) signed rounding temporary: same difference; (3) inline signed rounding expression: 56/56, diffs 0. Retained.
|
||||
AOSS_81401DC0: (1) reuse seed parameter: 48/48, four last-step register differences; (2) split shift/XOR statements: 64/48 instructions; (3) eight-iteration CRC loop: 16/48 instructions. Restored original.
|
||||
|
||||
AOSS_Init_old initial 28.42298%
|
||||
- full-width wait counters instead of narrowing every update: 28.546717%; src 0x1758 base 0x18c0 insns 1494/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
|
||||
AOSS_Init_old initial 28.42298%
|
||||
- full-width wait counters instead of narrowing every update: 28.546717%; src 0x1758 base 0x18c0 insns 1494/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
- packet length conversion retains full width: 28.42298%; src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
- poll arguments given semantic socket events structure: 28.42298%; src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
Retained original
|
||||
|
||||
AOSS_813FFD68 initial 96.981735%
|
||||
- validation loops use signed char: 93.69406%; src 0x364 base 0x36c insns 217/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- return failure immediately on invalid character: 82.05023%; src 0x2ec base 0x36c insns 187/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- ascending validation cursor loop: 94.76712%; src 0x374 base 0x36c insns 221/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained original
|
||||
|
||||
AOSS_814001B4 initial 88.78481%
|
||||
- converted packet length stays full width: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- direct opcode return cases: 83.27848%; src 0x124 base 0x13c insns 73/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- full-width validation and branch nesting: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained original
|
||||
|
||||
AOSS_814002F0 initial 79.525%
|
||||
- read manufacturer only after state validation: 85.058334%; src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 6:8 base 6:8; M 6 mr r30, r3; M 7 mr r26, r4
|
||||
- packet sequence values remain full-width: 76.441666%; src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4
|
||||
- direct address error branch: 79.525%; src 0x1c8 base 0x1e0 insns 114/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4
|
||||
Retained original
|
||||
|
||||
AOSS_81400830 initial 77.619934%
|
||||
- single-byte RC4 generation loop instead of manual pairs: 65.65109%; src 0x3c0 base 0x504 insns 240/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9
|
||||
- natural CRC byte loop: 60.13084%; src 0x3c4 base 0x504 insns 241/321; --- replace mine 5:6 base 5:7; M 5 mr r27, r3; B 5 mr r26, r3
|
||||
- narrow RC4 state indices at assignment: 77.619934%; src 0x4b8 base 0x504 insns 302/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9
|
||||
Retained original
|
||||
|
||||
AOSS_81400E0C initial 77.52105%
|
||||
- signed option lengths and iteration indices: 77.778946%; src 0x2bc base 0x2f8 insns 175/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8
|
||||
- natural integer byte decode for both address options: 44.963158%; src 0x188 base 0x2f8 insns 98/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8
|
||||
- address decode accumulation uses OR: 61.963158%; src 0x284 base 0x2f8 insns 161/190; --- replace mine 5:8 base 5:8; M 5 mr r29, r3; M 6 mr r30, r4
|
||||
Retained original
|
||||
|
||||
AOSS_814013AC initial 91.70175%
|
||||
- signed option lengths: 91.70175%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- apply flags after successful parser call: 84.68421%; src 0x1ec base 0x1c8 insns 123/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- bounded while loop over selected reply payload: 88.2807%; src 0x1d4 base 0x1c8 insns 117/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
Retained original
|
||||
|
||||
AOSS_81401574 initial 92.558136%
|
||||
- semantic payload extent expression: 92.558136%; src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
- request length remains full-width: 92.209305%; src 0x1f8 base 0x204 insns 126/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
- initialize destination length before port conversion: 88.31783%; src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
Retained original
|
||||
|
||||
AOSS_81401778 initial 71.93407%
|
||||
- CRC checksum stays full width until header store: 71.93407%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
- signed RC4 byte loop index: 71.93407%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
- copy hello payload before manufacturer encoding: 71.91575%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
Retained original
|
||||
|
||||
AOSS_81401C9C initial 71.9315%
|
||||
- natural RC4 state initialization loop: 43.342464%; src 0x98 base 0x124 insns 38/73; --- replace mine 0:1 base 0:2; M 0 li r9, 0; B 0 stwu r1, -0x10(r1)
|
||||
- schedule state reset before obtaining byte pointer: 71.9315%; src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0
|
||||
- signed key and state indices: 71.9315%; src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0
|
||||
Retained original
|
||||
|
||||
AOSS_81401E80 initial 91.80272%
|
||||
- natural XOR loop over half-packet: 56.455784%; src 0x168 base 0x24c insns 90/147; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x40(r1)
|
||||
- half-length via signed division: 87.04082%; src 0x240 base 0x24c insns 144/147; --- replace mine 5:19 base 5:13; M 5 srawi r0, r4, 1; M 6 mr r28, r3
|
||||
- count-down rounds: 88.734695%; src 0x244 base 0x24c insns 145/147; --- replace mine 6:7 base 6:7; M 6 mr r28, r3; B 6 mr r21, r3
|
||||
Retained original
|
||||
|
||||
AOSS_814020CC initial 76.066666%
|
||||
- sleep tick product stays 64-bit: 67.51667%; src 0xfc base 0xf0 insns 63/60; --- replace mine 3:6 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- tick duration via explicit multiply-high: 81.65%; src 0xe4 base 0xf0 insns 57/60; --- replace mine 3:5 base 3:6; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- do-while host acquisition loop: 65.066666%; src 0xf8 base 0xf0 insns 62/60; --- replace mine 3:6 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained original
|
||||
|
||||
AOSS final: retained exact packet builder AOSS_81401BBC only. Other experiments restored; remaining differences include loop expansion, register allocation, missing original compiler control flow.
|
||||
|
||||
## src/scene/memoryCard/iplMemoryCardBase
|
||||
Baseline absent source: 0/34, code 0/3640, data 0/152. Implemented all real functions in target address order from original disassembly using typed classes and fields. Initial build: 33/34 exact, code 3240/3640, data 144/152; pool identical.
|
||||
|
||||
onCmdRecv initial 96.35%: 101/100 instructions.
|
||||
- Signed lower/upper bounds for command range: extra comparison and branch.
|
||||
- Switch cases 1/2/3: 95.35%, 102/100 instructions, compiler produces signed comparison tree.
|
||||
- Unsigned command range distance: 100%, 100/100 instructions, diffs 0. Retained.
|
||||
|
||||
Data limitation: original .sdata2 contains -1.0 plus trailing alignment, while source also emits the required integer-to-float conversion double constant. No forced data or padding added. Full DOL gate determines acceptance; no configure Matching changes.
|
||||
|
||||
## Remaining functions at final handoff
|
||||
src/scene/setting/ATERM: ATERM_814021BC 67.655846% — src 0x264 base 0x268 insns 153/154; --- insert mine 7:7 base 7:9; B 7 addi r30, r30, 0; B 8 li r4, 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_8140276C 92.10345% — src 0x2ac base 0x2b8 insns 171/174; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0x80(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81402A24 72.47529% — src 0x3d0 base 0x41c insns 244/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81402E40 99.791664% — src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27; remaining register/scheduling differences
|
||||
src/scene/setting/ATERM: ATERM_81402FC0 67.28148% — src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_814031DC 85.7218% — src 0x1f4 base 0x214 insns 125/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_814033F0 65.868614% — src 0x21c base 0x224 insns 135/137; --- insert mine 7:7 base 7:8; B 7 li r24, 0; --- replace mine 10:29 base 11:17; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_814036D8 73.92742% — src 0x1e0 base 0x1f0 insns 120/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_814038C8 35.28917% — src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERMi_AutoConfigThread 94.6% — src 0xa0 base 0xa0 insns 40/40; diffs 9: [0, 2, 3, 20, 22, 23, 34, 36, 38]; 0 M stwu r1, -0x30(r1); B stwu r1, -0x20(r1); remaining register/scheduling differences
|
||||
src/scene/setting/ATERM: ATERM_81404844 19.615385% — src 0x19c base 0x1d4 insns 103/117; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x190(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81404A18 51.107437% — src 0x1c4 base 0x1e4 insns 113/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x150(r1); B 0 stwu r1, -0x1a0(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81404BFC 36.869404% — src 0x3dc base 0x430 insns 247/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_8140502C 35.666668% — src 0x280 base 0x228 insns 160/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81405254 30.464945% — src 0x3a4 base 0x43c insns 233/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81405690 26.601477% — src 0x3b4 base 0x43c insns 237/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81405ACC None% — src 0x17c base 0x240 insns 95/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:12 base 4:10; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERM_81405D0C 32.62639% — src 0x9e4 base 0xb40 insns 633/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERMi_ApConfigStart 86.49515% — src 0x1a4 base 0x19c insns 105/103; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x20(r1); remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERMi_ApConfigEnd 87.54263% — src 0x1dc base 0x204 insns 119/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/ATERM: ATERMi_ApConfigGetState 99.42857% — src 0x8c base 0x8c insns 35/35; diffs 3: [17, 18, 20]; 17 M lwz r6, 0xf8(r6); B lwz r0, 0xf8(r6); remaining register/scheduling differences
|
||||
src/scene/setting/AOSS: AOSS_Init_old 28.42298% — src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_813FFD68 96.981735% — src 0x364 base 0x36c insns 217/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_814001B4 41.518986% — src 0x118 base 0x13c insns 70/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_814002F0 79.525% — src 0x1c8 base 0x1e0 insns 114/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81400830 77.619934% — src 0x4b8 base 0x504 insns 302/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81400E0C 77.52105% — src 0x2c4 base 0x2f8 insns 177/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_814013AC 91.70175% — src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81401574 92.558136% — src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81401778 71.93407% — src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0); remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81401C9C 71.9315% — src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_81401DC0 99.375% — src 0xc0 base 0xc0 insns 48/48; diffs 4: [39, 41, 42, 43]; 39 M srwi r0, r3, 1; B srwi r3, r3, 1; remaining register/scheduling differences
|
||||
src/scene/setting/AOSS: AOSS_81401E80 91.80272% — src 0x244 base 0x24c insns 145/147; --- replace mine 6:7 base 6:7; M 6 mr r28, r3; B 6 mr r21, r3; remaining control-flow/codegen differences
|
||||
src/scene/setting/AOSS: AOSS_814020CC 76.066666% — src 0xf0 base 0xf0 insns 60/60; diffs 39: [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 26]; 3 M addi r11, r1, 0x20; B stw r31, 0x1c(r1); remaining register/scheduling differences
|
||||
|
||||
MemoryBase full clean gate: 34/34 instruction-exact, code 3640/3640, data 144/152, pool identical, regressions 0, forbidden patterns 0, readability warnings 0, DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d, GATE PASS. Data remains incomplete in objdiff; no artificial fix attempted.
|
||||
@@ -1,326 +0,0 @@
|
||||
# ATERM and AOSS continuation
|
||||
|
||||
Baseline ATERM: 5/26, code 1108/19204, data 18440/18864, fuzzy 50.973755. Baseline AOSS: 8/21, code 2764/16192, data 3896/3928, fuzzy 63.720604. All functions have bodies; existing large state machine and crypto bodies remain incomplete reconstructions. No absent symbols or empty bodies found.
|
||||
|
||||
ATERM_8140276C initial 92.10345%
|
||||
- previous cursor declaration before current cursor: no source change; skipped
|
||||
- signed record indices: 92.10345%; src 0x2ac base 0x2b8 insns 171/174; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0x80(r1)
|
||||
- AOSS flags initialized after clear: 91.72988%; src 0x2ac base 0x2b8 insns 171/174; --- replace mine 5:10 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402A24 initial 72.47529%
|
||||
- record byte count kept signed: no source change; skipped
|
||||
- allocate nullable buffers before handling failure: 72.380226%; src 0x3cc base 0x41c insns 243/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- multiply-high tick conversion: 75.76426%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402E40 initial 99.791664%
|
||||
- payload clear through byte alias: 99.791664%; src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
- natural checksum loop: 65.208336%; src 0x108 base 0x180 insns 66/96; --- replace mine 5:12 base 5:12; M 5 mr r28, r5; M 6 mr r26, r3
|
||||
- end length as packet byte extent: 95.572914%; src 0x180 base 0x180 insns 96/96; diffs 6: [9, 10, 42, 44, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- full-width checksum accumulator: 64.76296%; src 0x20c base 0x21c insns 131/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
- bottom-tested option loop: compile failed
|
||||
- early return for bad checksum: 66.94074%; src 0x20c base 0x21c insns 131/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814031DC initial 85.7218%
|
||||
- MAC text uses equal-sized buffers: 85.766914%; src 0x1f4 base 0x214 insns 125/133; --- replace mine 47:48 base 47:48; M 47 beq 288; B 47 beq 320
|
||||
- nibble conversion advances output cursor: 84.293236%; src 0x204 base 0x214 insns 129/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1)
|
||||
- inclusive digit bound and pointer-based MAC scan: 85.90225%; src 0x1f4 base 0x214 insns 125/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814033F0 initial 65.868614%
|
||||
- option fields retain converted word width: 67.39416%; src 0x214 base 0x224 insns 133/137; --- replace mine 5:6 base 5:6; M 5 addi r30, r3, 8; B 5 addi r29, r3, 8
|
||||
- bottom-tested parser dispatch: 65.79562%; src 0x21c base 0x224 insns 135/137; --- replace mine 5:6 base 5:6; M 5 addi r28, r3, 8; B 5 addi r29, r3, 8
|
||||
- signed nibble comparisons: 65.32117%; src 0x21c base 0x224 insns 135/137; --- insert mine 7:7 base 7:8; B 7 li r24, 0; --- replace mine 10:29 base 11:17
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814036D8 initial 73.92742%
|
||||
- security switch matches original decision tree: 85.22581%; src 0x1ec base 0x1f0 insns 123/124; --- replace mine 14:15 base 14:15; M 14 beq 340; B 14 beq 344
|
||||
- key text passed through one cursor: 87.0%; src 0x1e4 base 0x1f0 insns 121/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0
|
||||
- counted loop over key records: 73.92742%; src 0x1e0 base 0x1f0 insns 120/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814038C8 initial 35.28917%
|
||||
- one-shot 500ms wait replaces repeated alarm: 35.700314%; src 0x788 base 0xedc insns 482/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
- bottom-tested state machine and wait buffer order: 35.288116%; src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
- progress uses semantic structure: 35.28917%; src 0x784 base 0xedc insns 481/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0xe0(r1); B 0 stwu r1, -0x180(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81404844 initial 19.615385%
|
||||
- complete RFC3394 block handling with target initial value and byte counter: 89.89744%; src 0x1bc base 0x1d4 insns 111/117; --- replace mine 6:13 base 6:13; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
- hoist signed pass product outside block loop: 89.89744%; src 0x1bc base 0x1d4 insns 111/117; --- replace mine 6:13 base 6:13; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
- natural bytewise counter XOR loop: 62.299145%; src 0x178 base 0x1d4 insns 94/117; --- replace mine 6:13 base 6:13; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81404A18 initial 51.107437%
|
||||
- complete RFC3394 block handling with target initial value and byte counter: 74.38843%; src 0x1c0 base 0x1e4 insns 112/121; --- replace mine 6:13 base 6:14; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
- hoist signed pass product outside block loop: 74.38843%; src 0x1c0 base 0x1e4 insns 112/121; --- replace mine 6:13 base 6:14; M 6 lwz r8, 0(0); M 7 lwz r0, 0(0)
|
||||
- natural bytewise counter XOR loop: 55.96694%; src 0x180 base 0x1e4 insns 96/121; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x190(r1); B 0 stwu r1, -0x1a0(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81404BFC initial 36.869404%
|
||||
- complete AES schedules with bounded final expansion for all three key sizes: 52.50746%; src 0x408 base 0x430 insns 258/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
- direct expanded-key parameter used as advancing cursor: 52.50746%; src 0x408 base 0x430 insns 258/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
- round limit at loop bottom for 128-bit key: 53.074627%; src 0x404 base 0x430 insns 257/268; --- replace mine 0:6 base 0:20; M 0 lbz r7, 1(r4); M 1 cmplwi r5, 0x80
|
||||
Retained best candidate
|
||||
|
||||
ATERM_8140502C initial 35.666668%
|
||||
- interleaved key-word swaps: 42.355072%; src 0x280 base 0x228 insns 160/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
- signed indexed round reversal: 38.746376%; src 0x290 base 0x228 insns 164/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
- counted transformation loop: 11.731884%; src 0x288 base 0x228 insns 162/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405254 initial 30.464945%
|
||||
- AES byte assembly uses XOR: 34.23247%; src 0x3c4 base 0x43c insns 241/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- two-round loop with final round exit: compile failed
|
||||
- signed round count with separately combined key XOR: compile failed
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405690 initial 26.601477%
|
||||
- AES byte assembly uses XOR: 34.64945%; src 0x3d4 base 0x43c insns 245/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- two-round loop with final round exit: compile failed
|
||||
- signed round count with separately combined key XOR: compile failed
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405254 initial 34.23247%
|
||||
- two-round AES loop with final round exit matching target structure: 16.295202%; src 0x4a8 base 0x43c insns 298/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- signed remaining round-pair count: 16.295202%; src 0x4a8 base 0x43c insns 298/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- separate round exit before key advancement: 17.630997%; src 0x4a8 base 0x43c insns 298/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405690 initial 34.64945%
|
||||
- two-round AES loop with final round exit matching target structure: 33.738007%; src 0x4c8 base 0x43c insns 306/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- signed remaining round-pair count: 33.738007%; src 0x4c8 base 0x43c insns 306/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
- separate round exit before key advancement: 31.90037%; src 0x4c8 base 0x43c insns 306/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405D0C initial 32.62639%
|
||||
- complete MD5 accumulator rotation with per-step argument-relative selectors: 53.851387%; src 0xa50 base 0xb40 insns 660/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
- MD5 selectors expressed as XOR masks: 44.879166%; src 0xa48 base 0xb40 insns 658/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
- natural sixteen-word little-endian block decode: 47.679165%; src 0x970 base 0xb40 insns 604/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERMi_ApConfigGetState initial 99.42857%
|
||||
- read bus clock before current time call: 72.942856%; src 0x94 base 0x8c insns 37/35; --- replace mine 4:6 base 4:5; M 4 stw r30, 8(r1); M 5 mr r30, r3
|
||||
- direct timer division using clock conversion expression: 99.42857%; src 0x8c base 0x8c insns 35/35; diffs 3: [17, 18, 20]; 17 M lwz r6, 0xf8(r6); B lwz r0, 0xf8(r6)
|
||||
- timer load narrowed to native clock register width: 99.42857%; src 0x8c base 0x8c insns 35/35; diffs 4: [15, 16, 17, 18]; 15 M lis r5, -0x8000; B lis r6, -0x8000
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402E40 initial 99.791664%
|
||||
- checksum terminal pointer declared before byte length: 99.791664%; src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
- payload encryption size retained as signed integer: 99.791664%; src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
- end pointer assigned only after header conversion: 94.947914%; src 0x180 base 0x180 insns 96/96; diffs 8: [9, 10, 42, 44, 45, 46, 47, 52]; 9 M mr r29, r7; B mr r3, r27
|
||||
Retained best candidate
|
||||
|
||||
ATERMi_AutoConfigThread initial 94.6%
|
||||
- callback progress uses three-field structure: 94.75%; src 0xa0 base 0xa0 insns 40/40; diffs 3: [20, 22, 23]; 20 M nor r0, r3, r0; B nor r3, r3, r0
|
||||
- signed completion state mask in correctly sized progress buffer: 94.75%; src 0xa0 base 0xa0 insns 40/40; diffs 3: [20, 22, 23]; 20 M nor r0, r3, r0; B nor r3, r3, r0
|
||||
- explicit completion state branch in progress structure: 85.25%; src 0x9c base 0xa0 insns 39/40; --- replace mine 18:21 base 18:22; M 18 addi r0, r31, -1; M 19 li r5, -1
|
||||
Retained best candidate
|
||||
|
||||
ATERM_814021BC initial 67.655846%
|
||||
- interface configuration pointer initialized before IP setup: 64.266235%; src 0x264 base 0x268 insns 153/154; --- replace mine 7:8 base 7:8; M 7 addi r28, r30, 0; B 7 addi r30, r30, 0
|
||||
- wait queue message and buffer order follows target stack slots: 67.64286%; src 0x264 base 0x268 insns 153/154; --- insert mine 7:7 base 7:9; B 7 addi r30, r30, 0; B 8 li r4, 0
|
||||
- host wait expressed as while with shared converted host value: 92.77922%; src 0x274 base 0x268 insns 157/154; --- replace mine 5:8 base 5:8; M 5 lis r31, 0; M 6 li r28, 0
|
||||
Retained best candidate
|
||||
|
||||
ATERM_8140276C initial 92.10345%
|
||||
- previous-record cursor reset at outer loop tail and scoped fallback flags: 94.04023%; src 0x2b0 base 0x2b8 insns 172/174; --- replace mine 5:11 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4
|
||||
- previous record initialized before current record: 94.0115%; src 0x2b0 base 0x2b8 insns 172/174; --- replace mine 5:11 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4
|
||||
- fallback flags set after SSID clear: 94.04023%; src 0x2b0 base 0x2b8 insns 172/174; --- replace mine 5:11 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81405ACC initial 0%
|
||||
- complete two-phase update copy with target eight-byte group bounds: 55.54861%; src 0x21c base 0x240 insns 135/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:7 base 4:10
|
||||
- signed byte-copy loop cursors: 55.54861%; src 0x21c base 0x240 insns 135/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:7 base 4:10
|
||||
- cursor-pair copies instead of repeated indexed addresses: 55.54861%; src 0x21c base 0x240 insns 135/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:7 base 4:10
|
||||
Retained best candidate
|
||||
Retained complete update implementation: objdiff 55.54861%, 135/144 instructions. Older source had no reported function score; no exact claim.
|
||||
|
||||
ATERMi_ApConfigStart initial 86.49515%
|
||||
- allocate via stored callback: 86.49515%; src 0x1a4 base 0x19c insns 105/103; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x20(r1)
|
||||
- tick multiplier commutes operands: 84.11651%; src 0x1a4 base 0x19c insns 105/103; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x20(r1)
|
||||
- progress callback loaded from installed function pointer: 93.718445%; src 0x1a0 base 0x19c insns 104/103; --- delete mine 4:5 base 4:4; M 4 mr r31, r3; --- replace mine 6:7 base 5:6
|
||||
Retained best candidate
|
||||
|
||||
ATERMi_ApConfigEnd initial 87.54263%
|
||||
- message queues declared within their wait scopes: 85.496124%; src 0x1dc base 0x204 insns 119/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
- join loop expressed as do-while: 85.28682%; src 0x1e8 base 0x204 insns 122/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
- time conversion evaluated directly: 87.54263%; src 0x1dc base 0x204 insns 119/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- signed option payload cursor length: no source change; skipped
|
||||
- checksum receive pointer read after length decode: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
- option traversal explicit continuation: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402A24 initial 75.76426%
|
||||
- record allocation size held as size_t: no source change; skipped
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402FC0 initial 67.28148%
|
||||
- packet and option values stay full-width until usage: 68.577774%; src 0x208 base 0x21c insns 130/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- delete mine 15:16 base 16:16
|
||||
- full-width checksum accumulated before explicit final narrowing: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
- option lengths retained as signed word count: 67.28148%; src 0x210 base 0x21c insns 132/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- replace mine 9:10 base 10:11
|
||||
Retained best candidate
|
||||
|
||||
ATERM_81402A24 initial 75.76426%
|
||||
- record allocation byte count stored in size_t: 75.76426%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- iteration counter narrowed to signed timer range: 76.20532%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
- record pointer walk and indexed record walk share cursor: 75.76426%; src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1)
|
||||
Retained best candidate
|
||||
|
||||
ATERM reconstruction evidence: all 26 target function names have source bodies. Reconstructed RFC3394 wrap/unwrap initial value, signed counters, block writeback and unwrap ordering; corrected all three AES key schedules; corrected MD5 per-step accumulator/selector semantics and low/high bit counts; reconstructed the missing authentication timestamp digest and protocol option-id bytes in the main state machine. These are partial instruction matches, not completion.
|
||||
Native validation of extracted unchanged crypto implementations: NIST AES 128/192/256 encryption and decryption vectors passed. MD5 messages of length 0, 1, 3, 55, 56, 64, 130 matched hashlib. Native correctness is supplemental evidence only; MWCC objdiff remains the matching authority.
|
||||
Data attempts: ordinary local option-id initialization restored the real seven-byte constant sequence; .sdata2 reached 100%. Genuine MD5 fill array emitted locally, then as an ordinary named global after the state-machine function to preserve jump-table/source order. .data remains incomplete because the three generated jump tables still differ. AES tables and round constants remain byte-identical .rodata.
|
||||
Data attempt: restored the genuine request-options pointer initializer shown in target .sdata; it completed .sdata but moved the response buffer before the thread in .bss and caused objdiff .bss 100 -> 83.33333 and a matched-data regression. Tried source declaration order, original thread name, and original section-aligned network buffer declaration; none passed the regression gate. Restored the pointer attempt and kept the existing BSS layout. No artificial padding, address symbols, or forced sections retained. .sdata and .sbss remain open.
|
||||
|
||||
Initial AOSS trial batch failed to compile because of a mistaken message-length field name in the packet dispatcher; corrected the field and reran all trials successfully. Failed batch not counted as attempts.
|
||||
|
||||
AOSS_Init_old initial 28.42298%
|
||||
- full-width wait counters instead of narrowing every update: 28.546717%; src 0x1758 base 0x18c0 insns 1494/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
- packet length conversion retains full width: 28.42298%; src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
- poll arguments given semantic socket events structure: 28.42298%; src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b
|
||||
Retained best candidate
|
||||
|
||||
AOSS_813FFD68 initial 96.981735%
|
||||
- validation loops use signed char: 93.69406%; src 0x364 base 0x36c insns 217/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- return failure immediately on invalid character: 82.05023%; src 0x2ec base 0x36c insns 187/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- ascending validation cursor loop: 94.76712%; src 0x374 base 0x36c insns 221/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814001B4 initial 88.78481%
|
||||
- converted packet length stays full width: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- direct opcode return cases: 83.27848%; src 0x124 base 0x13c insns 73/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- full-width validation and branch nesting: no source change; skipped
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814002F0 initial 79.525%
|
||||
- read manufacturer only after state validation: 85.058334%; src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 6:8 base 6:8; M 6 mr r30, r3; M 7 mr r26, r4
|
||||
- packet sequence values remain full-width: 76.441666%; src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4
|
||||
- direct address error branch: 79.525%; src 0x1c8 base 0x1e0 insns 114/120; --- replace mine 5:7 base 5:8; M 5 mr r30, r3; M 6 mr r26, r4
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81400830 initial 77.619934%
|
||||
- single-byte RC4 generation loop instead of manual pairs: 65.65109%; src 0x3c0 base 0x504 insns 240/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9
|
||||
- natural CRC byte loop: 60.13084%; src 0x3c4 base 0x504 insns 241/321; --- replace mine 5:6 base 5:7; M 5 mr r27, r3; B 5 mr r26, r3
|
||||
- narrow RC4 state indices at assignment: 77.619934%; src 0x4b8 base 0x504 insns 302/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81400E0C initial 77.52105%
|
||||
- signed option lengths and iteration indices: 77.778946%; src 0x2bc base 0x2f8 insns 175/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8
|
||||
- natural integer byte decode for both address options: 44.963158%; src 0x188 base 0x2f8 insns 98/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8
|
||||
- address decode accumulation uses OR: 61.963158%; src 0x284 base 0x2f8 insns 161/190; --- replace mine 5:8 base 5:8; M 5 mr r29, r3; M 6 mr r30, r4
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814013AC initial 91.70175%
|
||||
- signed option lengths: 91.70175%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- apply flags after successful parser call: 84.68421%; src 0x1ec base 0x1c8 insns 123/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- bounded while loop over selected reply payload: 88.2807%; src 0x1d4 base 0x1c8 insns 117/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401574 initial 92.558136%
|
||||
- semantic payload extent expression: 92.558136%; src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
- request length remains full-width: 92.209305%; src 0x1f8 base 0x204 insns 126/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
- initialize destination length before port conversion: 88.31783%; src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401778 initial 71.93407%
|
||||
- CRC checksum stays full width until header store: 71.93407%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
- signed RC4 byte loop index: 71.93407%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
- copy hello payload before manufacturer encoding: 71.91575%; src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0)
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401C9C initial 71.9315%
|
||||
- natural RC4 state initialization loop: 43.342464%; src 0x98 base 0x124 insns 38/73; --- replace mine 0:1 base 0:2; M 0 li r9, 0; B 0 stwu r1, -0x10(r1)
|
||||
- schedule state reset before obtaining byte pointer: 71.9315%; src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0
|
||||
- signed key and state indices: 71.9315%; src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401E80 initial 91.80272%
|
||||
- natural XOR loop over half-packet: 56.455784%; src 0x168 base 0x24c insns 90/147; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x30(r1); B 0 stwu r1, -0x40(r1)
|
||||
- half-length via signed division: 87.04082%; src 0x240 base 0x24c insns 144/147; --- replace mine 5:19 base 5:13; M 5 srawi r0, r4, 1; M 6 mr r28, r3
|
||||
- count-down rounds: 88.734695%; src 0x244 base 0x24c insns 145/147; --- replace mine 6:7 base 6:7; M 6 mr r28, r3; B 6 mr r21, r3
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814020CC initial 76.066666%
|
||||
- sleep tick product stays 64-bit: 67.51667%; src 0xfc base 0xf0 insns 63/60; --- replace mine 3:6 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- tick duration via explicit multiply-high: 81.65%; src 0xe4 base 0xf0 insns 57/60; --- replace mine 3:5 base 3:6; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- do-while host acquisition loop: 65.066666%; src 0xf8 base 0xf0 insns 62/60; --- replace mine 3:6 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained best candidate
|
||||
|
||||
AOSS_81401DC0 initial 99.375%
|
||||
- CRC output accumulator reuses incoming seed value: 99.375%; src 0xc0 base 0xc0 insns 48/48; diffs 4: [39, 41, 42, 43]; 39 M srwi r0, r3, 1; B srwi r3, r3, 1
|
||||
- last CRC bit combined with conditional polynomial: 80.916664%; src 0xc8 base 0xc0 insns 50/48; --- delete mine 0:1 base 0:0; M 0 lis r3, -0x1247; --- replace mine 2:4 base 1:2
|
||||
- ordinary counted loop for eight CRC polynomial steps: 24.833334%; src 0x40 base 0xc0 insns 16/48; --- insert mine 0:0 base 0:1; B 0 li r0, 0x100; --- delete mine 1:3 base 2:2
|
||||
Retained best candidate
|
||||
|
||||
AOSS_Init_old initial 28.546717%
|
||||
- network settings alignment follows target 32-byte stack contract: 24.69697%; src 0x17f8 base 0x18c0 insns 1534/1584; --- replace mine 8:9 base 8:11; M 8 li r14, 0; B 8 lhz r4, 0(0)
|
||||
- request records alignment follows target stack offset a0: 24.69697%; src 0x17f8 base 0x18c0 insns 1534/1584; --- replace mine 8:9 base 8:11; M 8 li r14, 0; B 8 lhz r4, 0(0)
|
||||
- both network settings and request records use observed stack alignment: 24.69697%; src 0x17f8 base 0x18c0 insns 1534/1584; --- replace mine 8:9 base 8:11; M 8 li r14, 0; B 8 lhz r4, 0(0)
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814001B4 initial 88.78481%
|
||||
- opcode uses full-width switch expression after conversion: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- rejection increments written as explicit count stores: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
- validation represented by a named result before rejection: 88.78481%; src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0
|
||||
Retained best candidate
|
||||
|
||||
AOSS_814013AC initial 91.70175%
|
||||
- outer response stride evaluated once before cursor advancement: 91.70175%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- one option cursor serves outer and inner traversal: 91.70175%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
- config flags initialization delayed until matching response is located: 89.60526%; src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8
|
||||
Retained best candidate
|
||||
|
||||
AOSS .sbss source-order reconstruction: moved real existing address/status declarations into original address order; 28.57143 -> 57.14286.
|
||||
- explicit zero initialization of owned pointer globals: 42.857143%; original source restored if no improvement.
|
||||
- explicit zero initialization of runtime status globals: 57.14286%; original source restored if no improvement.
|
||||
- ordinary zero initialization of access-point address bytes: 28.57143%; original source restored if no improvement.
|
||||
|
||||
AOSS dispatch reconstruction: rejected empty/type/validation failures return immediately and opcode dispatch uses a switch; 41.518986 -> 88.78481%, 75/79 instructions. Remaining four instructions are prologue/epilogue save helpers versus individual register saves; three additional real source variations did not change them.
|
||||
AOSS_Init_old has a body for every observed state path; six distinct attempts logged. Restored narrow wait counters despite a small fuzzy gain from widening, because the original performs signed 16-bit wrapping assignments. Observed 32-byte stack alignment trials all worsened codegen and were restored. Renamed existing decompiler labels to meaningful state/cleanup names.
|
||||
AOSS .data/.bss/.sdata/.sdata2 remain 100%; ordinary source declaration reordering improves .sbss to 57.14286 but does not finish its symbol associations. Three normal initialization forms produced no further improvement and were restored. No forced sections, padding, address-pinning symbols, or table blobs added.
|
||||
|
||||
Current handoff: remaining functions and instruction evidence
|
||||
ATERM_814021BC 92.77922%: src 0x274 base 0x268 insns 157/154; --- replace mine 5:8 base 5:8; M 5 lis r31, 0; M 6 li r28, 0; M 7 addi r3, r31, 0
|
||||
ATERM_8140276C 94.04023%: src 0x2b0 base 0x2b8 insns 172/174; --- replace mine 5:11 base 5:13; M 5 mr r25, r3; M 6 mr r26, r4; M 7 mr r27, r5
|
||||
ATERM_81402A24 76.20532%: src 0x3f4 base 0x41c insns 253/263; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x80(r1); B 0 stwu r1, -0x90(r1); --- replace mine 2:4 base 2:4
|
||||
ATERM_81402E40 99.791664%: src 0x180 base 0x180 insns 96/96; diffs 4: [9, 10, 47, 52]; 9 M mr r29, r7; B mr r3, r27; 10 M mr r3, r27
|
||||
ATERM_81402FC0 68.577774%: src 0x208 base 0x21c insns 130/135; --- insert mine 8:8 base 8:9; B 8 li r31, 0; --- delete mine 15:16 base 16:16; M 15 li r31, 0
|
||||
ATERM_814031DC 85.90225%: src 0x1f4 base 0x214 insns 125/133; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x70(r1); B 0 stwu r1, -0x60(r1); --- replace mine 4:6 base 4:6
|
||||
ATERM_814033F0 67.39416%: src 0x214 base 0x224 insns 133/137; --- replace mine 5:6 base 5:6; M 5 addi r30, r3, 8; B 5 addi r29, r3, 8; --- insert mine 7:7 base 7:8
|
||||
ATERM_814036D8 87.0%: src 0x1e4 base 0x1f0 insns 121/124; --- replace mine 14:24 base 14:16; M 14 bne 36; M 15 addi r3, r25, 0; M 16 li r0, 4
|
||||
ATERM_814038C8 41.043114%: src 0x9b4 base 0xedc insns 621/951; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x140(r1); B 0 stwu r1, -0x180(r1); --- replace mine 2:4 base 2:4
|
||||
ATERMi_AutoConfigThread 94.75%: src 0xa0 base 0xa0 insns 40/40; diffs 3: [20, 22, 23]; 20 M nor r0, r3, r0; B nor r3, r3, r0; 22 M srawi r3, r0, 0x1f
|
||||
ATERM_81404844 92.62393%: src 0x1bc base 0x1d4 insns 111/117; --- replace mine 8:13 base 8:13; M 8 mr r29, r3; M 9 mr r22, r4; M 10 mr r23, r5
|
||||
ATERM_81404A18 75.82645%: src 0x1c0 base 0x1e4 insns 112/121; --- replace mine 8:13 base 8:14; M 8 mr r29, r3; M 9 mr r21, r4; M 10 mr r22, r5
|
||||
ATERM_81404BFC 74.36194%: src 0x46c base 0x430 insns 283/268; --- replace mine 6:7 base 6:7; M 6 cmplwi r5, 0x80; B 6 cmpwi r5, 0x80; --- delete mine 38:40 base 38:38
|
||||
ATERM_8140502C 42.355072%: src 0x280 base 0x228 insns 160/138; --- insert mine 5:5 base 5:8; B 5 stw r30, 8(r1); B 6 lis r30, 0; B 7 addi r30, r30, 0
|
||||
ATERM_81405254 34.23247%: src 0x3c4 base 0x43c insns 241/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1); --- replace mine 2:4 base 2:4
|
||||
ATERM_81405690 34.64945%: src 0x3d4 base 0x43c insns 245/271; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x40(r1); B 0 stwu r1, -0x50(r1); --- replace mine 2:4 base 2:4
|
||||
ATERM_81405ACC 55.54861%: src 0x21c base 0x240 insns 135/144; --- insert mine 2:2 base 2:3; B 2 slwi r7, r5, 3; --- replace mine 3:7 base 4:10; M 3 addi r11, r1, 0x20
|
||||
ATERM_81405D0C 53.851387%: src 0xa50 base 0xb40 insns 660/720; --- replace mine 0:1 base 0:1; M 0 stwu r1, -0x90(r1); B 0 stwu r1, -0xa0(r1); --- replace mine 2:4 base 2:4
|
||||
ATERMi_ApConfigStart 93.718445%: src 0x1a0 base 0x19c insns 104/103; --- delete mine 4:5 base 4:4; M 4 mr r31, r3; --- replace mine 6:7 base 5:6; M 6 mr r30, r8
|
||||
ATERMi_ApConfigEnd 87.54263%: src 0x1dc base 0x204 insns 119/129; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0xe0; M 4 bl 0; B 3 stw r31, 0xdc(r1)
|
||||
ATERMi_ApConfigGetState 99.42857%: src 0x8c base 0x8c insns 35/35; diffs 3: [17, 18, 20]; 17 M lwz r6, 0xf8(r6); B lwz r0, 0xf8(r6); 18 M addi r0, r5, 0x4dd3
|
||||
AOSS_Init_old 28.42298%: src 0x1794 base 0x18c0 insns 1509/1584; --- replace mine 0:1 base 0:4; M 0 stwu r1, -0x100(r1); B 0 clrlwi r11, r1, 0x1b; B 1 mr r12, r1
|
||||
AOSS_813FFD68 96.981735%: src 0x364 base 0x36c insns 217/219; --- replace mine 3:5 base 3:7; M 3 addi r11, r1, 0x20; M 4 bl 0; B 3 stw r31, 0x1c(r1)
|
||||
AOSS_814001B4 88.78481%: src 0x12c base 0x13c insns 75/79; --- replace mine 3:5 base 3:10; M 3 addi r11, r1, 0x20; M 4 bl 0; B 3 stw r31, 0x1c(r1)
|
||||
AOSS_814002F0 85.058334%: src 0x1c4 base 0x1e0 insns 113/120; --- replace mine 6:8 base 6:8; M 6 mr r30, r3; M 7 mr r26, r4; B 6 mr r26, r3
|
||||
AOSS_81400830 77.619934%: src 0x4b8 base 0x504 insns 302/321; --- insert mine 6:6 base 6:7; B 6 addi r29, r3, 0x18; --- insert mine 7:7 base 8:9; B 8 li r5, 8
|
||||
AOSS_81400E0C 77.778946%: src 0x2bc base 0x2f8 insns 175/190; --- insert mine 5:5 base 5:6; B 5 mr r29, r4; --- replace mine 6:8 base 7:8; M 6 mr r29, r4
|
||||
AOSS_814013AC 91.70175%: src 0x1cc base 0x1c8 insns 115/114; --- insert mine 6:6 base 6:7; B 6 mr r27, r3; --- delete mine 7:8 base 8:8; M 7 mr r27, r3
|
||||
AOSS_81401574 92.558136%: src 0x1fc base 0x204 insns 127/129; --- replace mine 5:7 base 5:7; M 5 lwz r30, 0(0); M 6 mr r27, r4; B 5 lwz r27, 0(0)
|
||||
AOSS_81401778 71.93407%: src 0x434 base 0x444 insns 269/273; --- replace mine 5:7 base 5:6; M 5 lis r31, 0; M 6 lwz r30, 0(0); B 5 lwz r28, 0(0)
|
||||
AOSS_81401C9C 71.9315%: src 0x12c base 0x124 insns 75/73; --- replace mine 0:6 base 0:2; M 0 stwu r1, -0x20(r1); M 1 mflr r0; M 2 stw r0, 0x24(r1)
|
||||
AOSS_81401DC0 99.375%: src 0xc0 base 0xc0 insns 48/48; diffs 4: [39, 41, 42, 43]; 39 M srwi r0, r3, 1; B srwi r3, r3, 1; 41 M xoris r0, r0, 0xedb8
|
||||
AOSS_81401E80 91.80272%: src 0x244 base 0x24c insns 145/147; --- replace mine 6:7 base 6:7; M 6 mr r28, r3; B 6 mr r21, r3; --- replace mine 8:20 base 8:13
|
||||
AOSS_814020CC 81.65%: src 0xe4 base 0xf0 insns 57/60; --- replace mine 3:5 base 3:6; M 3 addi r11, r1, 0x20; M 4 bl 0; B 3 stw r31, 0x1c(r1)
|
||||
|
||||
Supplemental native crypto validation: NIST AES-128/192/256 encrypt/decrypt vectors passed; MD5 lengths 0, 1, 3, 55, 56, 64, 130 and streaming chunks 1, 7, 55, 63, 64, 65, 127 over 512 bytes passed against hashlib. RFC3394 wrap/unwrap passed using a temporary native test copy that explicitly emulates Wii big-endian counter bytes; unchanged x86 union byte order does not emulate the target. Tests reside under /tmp; MWCC object and gate remain matching authority.
|
||||
@@ -11,6 +11,9 @@ splits: 'config/43U/splits.txt'
|
||||
ldscript_template: 'config/ldscript_ipl2.lcf'
|
||||
|
||||
force_active:
|
||||
- SORead
|
||||
- SOFcntl
|
||||
- SOInetPtoN
|
||||
- SOGetSockOpt
|
||||
- SOSetInterfaceOpt
|
||||
- fprintf
|
||||
@@ -44,6 +47,18 @@ block_relocations:
|
||||
- source: .data:0x8165E19C
|
||||
|
||||
add_relocations:
|
||||
- source: .text:0x8152C08C
|
||||
type: ha
|
||||
target: __ArenaLo
|
||||
- source: .text:0x8152C090
|
||||
type: l
|
||||
target: __ArenaLo
|
||||
- source: .text:0x8152C134
|
||||
type: ha
|
||||
target: __ArenaLo
|
||||
- source: .text:0x8152C138
|
||||
type: l
|
||||
target: __ArenaLo
|
||||
- source: .data:0x8165E15C
|
||||
type: abs
|
||||
target: csAninationFile__Q29textinput7toolbar
|
||||
|
||||
@@ -897,13 +897,16 @@ src/scene/setting/iplRakuRakuThread.cpp:
|
||||
.sbss start:0x81698C60 end:0x81698C70
|
||||
|
||||
src/scene/setting/AOSS.c:
|
||||
.bss start:0x810BDEF8 end:0x810BECA0
|
||||
.bss start:0x810BDEF8 end:0x810BE838
|
||||
.text start:0x813FE27C end:0x814021BC
|
||||
.data start:0x81657C48 end:0x81657DB8
|
||||
.sdata2 start:0x81694C78 end:0x81694C80
|
||||
.sdata start:0x81697200 end:0x81697218
|
||||
.sbss start:0x81698C70 end:0x81698C90
|
||||
|
||||
src/scene/setting/AOSSData.c:
|
||||
.bss start:0x810BE838 end:0x810BECA0
|
||||
|
||||
src/scene/setting/ATERM.c:
|
||||
.bss start:0x810BECA0 end:0x810C0C80
|
||||
.text start:0x814021BC end:0x81406CC0
|
||||
|
||||
@@ -42,7 +42,7 @@ AppLoaderHdr = .bss:0x810ABF40; // type:object size:0x20 align:32 data:4byte
|
||||
bi2 = .bss:0x810ABF60; // type:object size:0x2000 align:32 data:4byte
|
||||
UpdateDiskID = .bss:0x810ADF60; // type:object size:0x20 align:32 data:4byte
|
||||
TicketViewsBuf = .bss:0x810ADF80; // type:object size:0x3600 scope:local align:32
|
||||
Flags0 = .bss:0x810B1580; // type:object size:0x800 scope:local
|
||||
Flags0$1129 = .bss:0x810B1580; // type:object size:0x800 scope:local
|
||||
Flags1 = .bss:0x810B1D80; // type:object size:0x800 scope:local
|
||||
Thread = .bss:0x810B2580; // type:object size:0x318 scope:local
|
||||
UpdateHeader0 = .bss:0x810B38A0; // type:object size:0x20 scope:local
|
||||
@@ -93,8 +93,8 @@ sRakuMsgQueue = .bss:0x810BDED4; // type:object size:0x20
|
||||
AOSS_810BDEF8 = .bss:0x810BDEF8; // type:object size:0x20 data:4byte
|
||||
AOSS_810BDF18 = .bss:0x810BDF18; // type:object size:0x6A0
|
||||
AOSS_810BE5B8 = .bss:0x810BE5B8; // type:object size:0x280
|
||||
AOSS_810BE838 = .bss:0x810BE838; // type:object size:0x68
|
||||
AOSS_810BE8A0 = .bss:0x810BE8A0; // type:object size:0x400
|
||||
s_packetState = .bss:0x810BE838; // type:object size:0x68
|
||||
s_crcTable = .bss:0x810BE8A0; // type:object size:0x400
|
||||
gAtermIpConfig = .bss:0x810BECA0; // type:object size:0x7C4 data:4byte
|
||||
gAtermIfConfig = .bss:0x810BF464; // type:object size:0x15E
|
||||
ATERM_810BF5C4 = .bss:0x810BF5C4; // type:object size:0x24
|
||||
@@ -144,7 +144,7 @@ lbl_810C8A80 = .bss:0x810C8A80; // type:object size:0x40 align:32
|
||||
lbl_810C8AC0 = .bss:0x810C8AC0; // type:object size:0x40 align:32
|
||||
s_mutex = .bss:0x810C8B00; // type:object size:0x18 scope:local
|
||||
s_cdbWiiId = .bss:0x810C8B20; // type:object size:0x40 scope:local
|
||||
ncdMutex = .bss:0x810C8B60; // type:object size:0x20
|
||||
ncdMutex = .bss:0x810C8B60; // type:object size:0x18
|
||||
ncdCommonResult = .bss:0x810C8B80; // type:object size:0x20 align:32 data:4byte
|
||||
ncdCommonVector = .bss:0x810C8BA0; // type:object size:0x20 align:32 data:4byte
|
||||
NHTTPiStaticResource = .bss:0x810C8BC0; // type:object size:0x40 data:4byte
|
||||
@@ -2524,7 +2524,7 @@ __ct__Q33ipl3snd10tagSSeInfoFv = .text:0x8136C63C; // type:function size:0x30
|
||||
__ct__Q34nw4r3snd11SoundHandleFv = .text:0x8136C66C; // type:function size:0xC
|
||||
__dt__Q34nw4r3snd11SoundHandleFv = .text:0x8136C678; // type:function size:0x54
|
||||
__dt__Q33ipl3snd10tagSSeInfoFv = .text:0x8136C6CC; // type:function size:0x58
|
||||
__dt__Q33ipl3snd6UnkClsFv = .text:0x8136C724; // type:function size:0x1C scope:local
|
||||
__arraydtor$15982 = .text:0x8136C724; // type:function size:0x1C scope:local
|
||||
__ct__Q33ipl3snd11tagSBgmInfoFv = .text:0x8136C740; // type:function size:0x30 scope:local
|
||||
__dt__Q33ipl3snd11tagSBgmInfoFv = .text:0x8136C770; // type:function size:0x58
|
||||
__ct__Q33ipl3snd6SystemFv = .text:0x8136C7C8; // type:function size:0x4C
|
||||
@@ -3223,7 +3223,7 @@ __dt__Q33ipl5scene5BoardFv = .text:0x81393CA4; // type:function size:0x68
|
||||
__ct__Q33ipl5scene11BoardObjectFv = .text:0x81393D1C; // type:function size:0x140
|
||||
__dt__Q33ipl4math28LinearIntp<Q33ipl4math4VEC2>Fv = .text:0x81393E5C; // type:function size:0x40
|
||||
__dt__Q33ipl4math31Interporation<Q33ipl4math4VEC2>Fv = .text:0x81393E9C; // type:function size:0x40
|
||||
init__Q43ipl5scene11BoardObject29@class$8157iplBoardObject_cppFv = .text:0x81393EDC; // type:function size:0x18
|
||||
init__Q43ipl5scene11BoardObject9StandDataFv = .text:0x81393EDC; // type:function size:0x18
|
||||
make_icon_cb___Q23ipl5sceneFPQ33ipl6nigaoe6ObjectPv = .text:0x81393EF4; // type:function size:0x80
|
||||
create__Q33ipl5scene11BoardObjectFPQ33ipl4nand10LayoutFilePUcUlRC6_CDBIdRC13_CDBRecordKeyRCQ33ipl7utility4Date = .text:0x81393F74; // type:function size:0x84
|
||||
init__Q33ipl5scene11BoardObjectFv = .text:0x81393FF8; // type:function size:0xA4
|
||||
@@ -4584,11 +4584,11 @@ enqueueLoadNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB308; // type:f
|
||||
enqueuePageNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB364; // type:function size:0x5C
|
||||
enqueueResultNotice__Q33ipl5scene15SDChannelSelectFUl = .text:0x813DB3C0; // type:function size:0x5C
|
||||
enqueueChannelNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB41C; // type:function size:0x5C
|
||||
enqueueMoveNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB478; // type:function size:0x5C
|
||||
enqueueMoveNotice__Q33ipl5scene15SDChannelSelectFUx = .text:0x813DB478; // type:function size:0x5C
|
||||
enqueueStateNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB4D4; // type:function size:0x5C
|
||||
enqueueErrorNotice__Q33ipl5scene15SDChannelSelectFUlUl = .text:0x813DB530; // type:function size:0x5C
|
||||
enqueueCommandNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB58C; // type:function size:0x60
|
||||
enqueueDeleteNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB5EC; // type:function size:0x60
|
||||
enqueueErrorNotice__Q33ipl5scene15SDChannelSelectFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x813DB530; // type:function size:0x5C
|
||||
enqueueCommandNotice__Q33ipl5scene15SDChannelSelectFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x813DB58C; // type:function size:0x60
|
||||
enqueueDeleteNotice__Q33ipl5scene15SDChannelSelectFUx = .text:0x813DB5EC; // type:function size:0x60
|
||||
clearCommandQueue__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB64C; // type:function size:0x40
|
||||
clearNoticeQueue__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB68C; // type:function size:0x40
|
||||
processWorkerCommands__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB6CC; // type:function size:0x518
|
||||
@@ -4617,11 +4617,11 @@ updateDialogAnimation__Q33ipl5scene15SDChannelSelectFv = .text:0x813DCAC4; // ty
|
||||
setDialogMessage__Q33ipl5scene15SDChannelSelectFUlUl = .text:0x813DCEF0; // type:function size:0x24
|
||||
isCurrentTitleUsageEnough__Q33ipl5scene15SDChannelSelectCFPCl = .text:0x813DCF14; // type:function size:0xCC
|
||||
getCurrentTitleUsage__Q33ipl5scene15SDChannelSelectCFPlPl = .text:0x813DCFE0; // type:function size:0xCC
|
||||
collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl = .text:0x813DD0AC; // type:function size:0x194
|
||||
collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl = .text:0x813DD240; // type:function size:0x198
|
||||
collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl = .text:0x813DD3D8; // type:function size:0x1F8
|
||||
collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl = .text:0x813DD5D0; // type:function size:0x5A4
|
||||
collectTitlesForMode__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUli = .text:0x813DDB74; // type:function size:0x40
|
||||
collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPlPlPUxPA21_wPUl = .text:0x813DD0AC; // type:function size:0x194
|
||||
collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPlPlPUxPA21_wPUl = .text:0x813DD240; // type:function size:0x198
|
||||
collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPlPlPUxPA21_wPUl = .text:0x813DD3D8; // type:function size:0x1F8
|
||||
collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPlPlPUxPA21_wPUl = .text:0x813DD5D0; // type:function size:0x5A4
|
||||
collectTitlesForMode__Q33ipl5scene15SDChannelSelectFPlPlPUxPA21_wPUli = .text:0x813DDB74; // type:function size:0x40
|
||||
findAdjacentChannel__Q33ipl5scene15SDChannelSelectCFiPiPi = .text:0x813DDBB4; // type:function size:0xB4
|
||||
setCurrentPageAndRefresh__Q33ipl5scene15SDChannelSelectFiiPQ33ipl5scene12SDChannelObj = .text:0x813DDC68; // type:function size:0x18
|
||||
handleFourPageDialog__Q33ipl5scene15SDChannelSelectFv = .text:0x813DDC80; // type:function size:0x58
|
||||
@@ -4762,7 +4762,7 @@ iplSDChannelTitle_updateParentalResult = .text:0x813E69B4; // type:function size
|
||||
iplSDChannelTitle_updateDialogResult = .text:0x813E6B88; // type:function size:0x144
|
||||
iplSDChannelTitle_startCopyProgress = .text:0x813E6CCC; // type:function size:0x158
|
||||
iplSDChannelTitle_updateCopyPrepare = .text:0x813E6E24; // type:function size:0x17C
|
||||
iplSDChannelTitle_copyTitleRange = .text:0x813E6FA0; // type:function size:0x14
|
||||
__as__Q43ipl5scene8SDMemory10TitleRangeFRCQ43ipl5scene8SDMemory10TitleRange = .text:0x813E6FA0; // type:function size:0x14 scope:weak
|
||||
iplSDChannelTitle_updateMemoryCalc = .text:0x813E6FB4; // type:function size:0xC0
|
||||
iplSDChannelTitle_updateCopyStart = .text:0x813E7074; // type:function size:0x130
|
||||
iplSDChannelTitle_updateAfterClearTmp = .text:0x813E71A4; // type:function size:0xA8
|
||||
@@ -4900,8 +4900,8 @@ onDialogState23__Q33ipl5scene8SDMemoryFv = .text:0x813EEDF8; // type:function si
|
||||
onDialogState24__Q33ipl5scene8SDMemoryFv = .text:0x813EEE70; // type:function size:0xC0
|
||||
draw__Q33ipl5scene8SDMemoryFv = .text:0x813EEF30; // type:function size:0x88
|
||||
drawTransferTitles__Q33ipl5scene8SDMemoryFv = .text:0x813EEFB8; // type:function size:0x70C
|
||||
writeFourFlagBytes__Q23ipl5sceneFPUcUcUcUcUc = .text:0x813EF6C4; // type:function size:0x14
|
||||
setTitleRowColors__Q23ipl5sceneFPQ34nw4r3lyt7TextBoxRCQ34nw4r2ut5ColorRCQ34nw4r2ut5Color = .text:0x813EF6D8; // type:function size:0x48
|
||||
__ct__Q34nw4r2ut5ColorFiiii = .text:0x813EF6C4; // type:function size:0x14
|
||||
SetTextColor__Q34nw4r3lyt7TextBoxFQ34nw4r2ut5ColorQ34nw4r2ut5Color = .text:0x813EF6D8; // type:function size:0x48
|
||||
GetBeginIter__Q34nw4r2ut28LinkList<Q34nw4r3lyt4Pane,4>Fv = .text:0x813EF720; // type:function size:0x8
|
||||
GetEndIter__Q34nw4r2ut28LinkList<Q34nw4r3lyt4Pane,4>Fv = .text:0x813EF728; // type:function size:0x8
|
||||
__ne__Q24nw4r2utFQ44nw4r2ut28LinkList<Q34nw4r3lyt4Pane,4>8IteratorQ44nw4r2ut28LinkList<Q34nw4r3lyt4Pane,4>8Iterator = .text:0x813EF730; // type:function size:0x18
|
||||
@@ -13963,7 +13963,7 @@ lbl_816152D0 = .rodata:0x816152D0; // type:object size:0x10 scope:local data:4by
|
||||
csAninationFile__Q29textinput12candidatebox = .rodata:0x816152E0; // type:object size:0x374 scope:local
|
||||
lbl_81615658 = .rodata:0x81615658; // type:object size:0xA0 scope:local data:4byte
|
||||
csAninationFile__Q29textinput7toolbar = .rodata:0x816156F8; // type:object size:0x1DC scope:local data:4byte
|
||||
csAninationFile__Q29textinput11predictlang = .rodata:0x816158D8; // type:object size:0x268 scope:local
|
||||
csAninationFile__Q29textinput11predictlang = .rodata:0x816158D8; // type:object size:0x264 scope:local
|
||||
csAninationFileForSign__Q39textinput8keyboard10signwindow = .rodata:0x81615B40; // type:object size:0x268 scope:local
|
||||
csPaneNameToControlKey__Q39textinput8keyboard10signwindow = .rodata:0x81615DA8; // type:object size:0x48 scope:local
|
||||
csLanguageDependencyData__Q39textinput8keyboard10signwindow = .rodata:0x81615DF0; // type:object size:0x50 scope:local
|
||||
@@ -15632,7 +15632,7 @@ __vt__Q33ipl4math28LinearIntp<Q33ipl4math4VEC2> = .data:0x8164B5E0; // type:obje
|
||||
__vt__Q33ipl4math31Interporation<Q33ipl4math4VEC2> = .data:0x8164B5F0; // type:object size:0x10
|
||||
@10018 = .data:0x8164B698; // type:object size:0xB scope:local data:string
|
||||
@10019 = .data:0x8164B6A3; // type:object size:0xF scope:local data:string
|
||||
__vt__Q33ipl5scene12UrlProcessor = .data:0x8164B6B8; // type:object size:0x18
|
||||
__vt__Q33ipl5scene12UrlProcessor = .data:0x8164B6B8; // type:object size:0x14
|
||||
lbl_8164B6D0 = .data:0x8164B6D0; // type:object size:0x10 data:string
|
||||
lbl_8164B6E0 = .data:0x8164B6E0; // type:object size:0x1D data:string
|
||||
lbl_8164B6FD = .data:0x8164B6FD; // type:object size:0x1B data:string
|
||||
@@ -15765,7 +15765,8 @@ lbl_8164C53A = .data:0x8164C53A; // type:object size:0x14
|
||||
lbl_8164C54E = .data:0x8164C54E; // type:object size:0x18
|
||||
lbl_8164C566 = .data:0x8164C566; // type:object size:0xC
|
||||
lbl_8164C572 = .data:0x8164C572; // type:object size:0xA
|
||||
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0xA4
|
||||
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0x88
|
||||
__vt__Q23gui12EventHandler = .data:0x8164C604; // type:object size:0x18 scope:weak
|
||||
scN_CalDay_r = .data:0x8164C620; // type:object size:0xB data:string
|
||||
scDateAnimPaneNames = .data:0x8164C62C; // type:object size:0x14 data:4byte
|
||||
scMyIplTopFBrlan = .data:0x8164C640; // type:object size:0x12 data:string
|
||||
@@ -17726,12 +17727,20 @@ __vt__Q39textinput4util9Animation = .data:0x8165D258; // type:object size:0x24
|
||||
@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl = .data:0x8165D28C; // type:object size:0x41 data:string
|
||||
scT_prdc_Text_00 = .data:0x8165D2D0; // type:object size:0xF data:string
|
||||
scP_prdc_scrl_Left = .data:0x8165D2E0; // type:object size:0x11 data:string
|
||||
scCandidatePaneData = .data:0x8165D2F8; // type:object size:0x68C
|
||||
scPaneNameTable = .data:0x8165D984; // type:object size:0x84
|
||||
scW_predictWindow = .data:0x8165DA08; // type:object size:0x10 data:string
|
||||
scN_predictInput = .data:0x8165DA18; // type:object size:0xF data:string
|
||||
scW_OnOff_Area = .data:0x8165DA28; // type:object size:0xD data:string
|
||||
scN_prdc_Texts = .data:0x8165DA38; // type:object size:0xD data:string
|
||||
csPaneToAnimation__Q29textinput12candidatebox = .data:0x8165D2F8; // type:object size:0x680 scope:local
|
||||
@9934 = .data:0x8165D978; // type:object size:0x9 scope:local data:string
|
||||
@9935 = .data:0x8165D984; // type:object size:0x9 scope:local data:string
|
||||
@9936 = .data:0x8165D990; // type:object size:0xB scope:local data:string
|
||||
@9937 = .data:0x8165D99C; // type:object size:0xB scope:local data:string
|
||||
@9938 = .data:0x8165D9A8; // type:object size:0xA scope:local data:string
|
||||
@9939 = .data:0x8165D9B4; // type:object size:0x11 scope:local data:string
|
||||
@9940 = .data:0x8165D9C8; // type:object size:0x11 scope:local data:string
|
||||
@9941 = .data:0x8165D9DC; // type:object size:0x11 scope:local data:string
|
||||
@9942 = .data:0x8165D9F0; // type:object size:0x11 scope:local data:string
|
||||
@9943 = .data:0x8165DA08; // type:object size:0x10 scope:local data:string
|
||||
@10036 = .data:0x8165DA18; // type:object size:0xF scope:local data:string
|
||||
@10037 = .data:0x8165DA28; // type:object size:0xD scope:local data:string
|
||||
@10041 = .data:0x8165DA38; // type:object size:0xD scope:local data:string
|
||||
@10530 = .data:0x8165DA48; // type:object size:0x1C scope:local
|
||||
@6761 = .data:0x8165DA64; // type:object size:0xF scope:local data:string
|
||||
@6762 = .data:0x8165DA74; // type:object size:0xF scope:local data:string
|
||||
@@ -20924,31 +20933,28 @@ lbl_81694D18 = .sdata2:0x81694D18; // type:object size:0x4 data:4byte
|
||||
lbl_81694D1C = .sdata2:0x81694D1C; // type:object size:0x4 data:4byte
|
||||
lbl_81694D20 = .sdata2:0x81694D20; // type:object size:0x1 data:byte
|
||||
lbl_81694D24 = .sdata2:0x81694D24; // type:object size:0x1 data:byte
|
||||
scInputFormZeroF = .sdata2:0x81694D28; // type:object size:0x4 align:4 data:float
|
||||
scInputForm640F = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float
|
||||
scInputFormF32ConvertMagic = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double
|
||||
scInputFormOneF = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float
|
||||
scInputFormHalfF = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float
|
||||
scInputFormDegToFIdxF = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
|
||||
scInputForm150F = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float
|
||||
scInputForm30F = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float
|
||||
scInputForm50F = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float
|
||||
scInputForm10F = .sdata2:0x81694D50; // type:object size:0x4 align:4 data:float
|
||||
scInputForm52F = .sdata2:0x81694D54; // type:object size:0x4 align:4 data:float
|
||||
scInputFormTwoF = .sdata2:0x81694D58; // type:object size:0x4 align:4 data:float
|
||||
scInputForm140F = .sdata2:0x81694D5C; // type:object size:0x4 align:4 data:float
|
||||
scInputForm90F = .sdata2:0x81694D60; // type:object size:0x4 align:4 data:float
|
||||
scInputForm253F = .sdata2:0x81694D64; // type:object size:0x4 align:4 data:float
|
||||
scInputForm20F = .sdata2:0x81694D68; // type:object size:0x4 align:4 data:float
|
||||
scInputFormColorRU8 = .sdata2:0x81694D6C; // type:object size:0x1 data:byte
|
||||
scInputFormColorGU8 = .sdata2:0x81694D6D; // type:object size:0x1 data:byte
|
||||
scInputFormColorBU8 = .sdata2:0x81694D6E; // type:object size:0x1 data:byte
|
||||
scInputFormColorAU8 = .sdata2:0x81694D6F; // type:object size:0x1 data:byte
|
||||
scInputForm255F = .sdata2:0x81694D70; // type:object size:0x4 align:4 data:float
|
||||
scInputForm127F = .sdata2:0x81694D74; // type:object size:0x4 align:4 data:float
|
||||
scInputForm14592F = .sdata2:0x81694D78; // type:object size:0x4 align:4 data:float
|
||||
scInputFormF64ConvertMagic = .sdata2:0x81694D80; // type:object size:0x8 align:8 data:double
|
||||
scInputForm15F = .sdata2:0x81694D88; // type:object size:0x4 align:4 data:float
|
||||
@13326 = .sdata2:0x81694D28; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13327 = .sdata2:0x81694D2C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13360 = .sdata2:0x81694D30; // type:object size:0x8 scope:local align:8 data:double
|
||||
@13767 = .sdata2:0x81694D38; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13772 = .sdata2:0x81694D3C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13804 = .sdata2:0x81694D40; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13805 = .sdata2:0x81694D44; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13806 = .sdata2:0x81694D48; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13807 = .sdata2:0x81694D4C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13808 = .sdata2:0x81694D50; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13809 = .sdata2:0x81694D54; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13810 = .sdata2:0x81694D58; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13811 = .sdata2:0x81694D5C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13812 = .sdata2:0x81694D60; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13813 = .sdata2:0x81694D64; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13814 = .sdata2:0x81694D68; // type:object size:0x4 scope:local align:4 data:float
|
||||
@8131 = .sdata2:0x81694D6C; // type:object size:0x4 scope:local data:byte
|
||||
@14016 = .sdata2:0x81694D70; // type:object size:0x4 scope:local align:4 data:float
|
||||
@14017 = .sdata2:0x81694D74; // type:object size:0x4 scope:local align:4 data:float
|
||||
@14018 = .sdata2:0x81694D78; // type:object size:0x4 scope:local align:4 data:float
|
||||
@14021 = .sdata2:0x81694D80; // type:object size:0x8 scope:local align:8 data:double
|
||||
@14117 = .sdata2:0x81694D88; // type:object size:0x4 scope:local align:4 data:float
|
||||
lbl_81694D90 = .sdata2:0x81694D90; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D94 = .sdata2:0x81694D94; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D98 = .sdata2:0x81694D98; // type:object size:0x4 align:4 data:float
|
||||
@@ -22773,10 +22779,7 @@ lbl_81697824 = .sdata:0x81697824; // type:object size:0x8 data:string
|
||||
lbl_8169782C = .sdata:0x8169782C; // type:object size:0x8 data:string
|
||||
lbl_81697834 = .sdata:0x81697834; // type:object size:0x8 data:string
|
||||
lbl_8169783C = .sdata:0x8169783C; // type:object size:0x8 data:string
|
||||
scCsFatalColorR = .sdata:0x81697844; // type:object size:0x1 data:byte
|
||||
scCsFatalColorG = .sdata:0x81697845; // type:object size:0x1 data:byte
|
||||
scCsFatalColorB = .sdata:0x81697846; // type:object size:0x1 data:byte
|
||||
scCsFatalColorA = .sdata:0x81697847; // type:object size:0x1 data:byte
|
||||
scCsFatalColor = .sdata:0x81697844; // type:object size:0x4 data:byte
|
||||
lbl_81697848 = .sdata:0x81697848; // type:object size:0x8 data:string
|
||||
lbl_81697850 = .sdata:0x81697850; // type:object size:0x6 data:string
|
||||
lbl_81697858 = .sdata:0x81697858; // type:object size:0x6 data:string
|
||||
@@ -23675,8 +23678,8 @@ RegionValid = .sbss:0x81698A48; // type:object size:0x4 data:4byte
|
||||
NandPending = .sbss:0x81698A4C; // type:object size:0x4 scope:local data:4byte
|
||||
CancelNand = .sbss:0x81698A50; // type:object size:0x4 scope:local data:4byte
|
||||
LowReadResult = .sbss:0x81698A54; // type:object size:0x4 scope:local data:4byte
|
||||
CacheCommandComplete = .sbss:0x81698A58; // type:object size:0x4 scope:local data:4byte
|
||||
AudioBufferUnconfigured = .sbss:0x81698A5C; // type:object size:0x4 scope:local data:4byte
|
||||
CacheCommandComplete$1963 = .sbss:0x81698A58; // type:object size:0x4 scope:local data:4byte
|
||||
AudioBufferUnconfigured$2065 = .sbss:0x81698A5C; // type:object size:0x4 scope:local data:4byte
|
||||
ResetTime = .sbss:0x81698A60; // type:object size:0x8 scope:local data:4byte
|
||||
SpinupDeadline = .sbss:0x81698A68; // type:object size:0x8 scope:local data:4byte
|
||||
CoverPollTime = .sbss:0x81698A70; // type:object size:0x8 data:4byte
|
||||
@@ -23684,15 +23687,13 @@ DriveWasReset = .sbss:0x81698A78; // type:object size:0x4 data:4byte
|
||||
TitleTicketView = .sbss:0x81698A7C; // type:object size:0x4 scope:local data:4byte
|
||||
CurrentTmd = .sbss:0x81698A80; // type:object size:0x4 scope:local data:4byte
|
||||
TitleCode = .sbss:0x81698A84; // type:object size:0x4 data:4byte
|
||||
RequiredIosHigh = .sbss:0x81698A88; // type:object size:0x4 data:4byte
|
||||
RequiredIosLow = .sbss:0x81698A8C; // type:object size:0x4 data:4byte
|
||||
RequiredIos = .sbss:0x81698A88; // type:object size:0x8 data:4byte
|
||||
GamePartition = .sbss:0x81698A90; // type:object size:0x4 data:4byte
|
||||
UpdatePartition = .sbss:0x81698A94; // type:object size:0x4 data:4byte
|
||||
PartitionCursor = .sbss:0x81698A98; // type:object size:0x4 data:4byte
|
||||
DataToc = .sbss:0x81698A9C; // type:object size:0x4 data:4byte
|
||||
GameToc = .sbss:0x81698AA0; // type:object size:0x8 data:4byte
|
||||
CoverOpenTimeHigh = .sbss:0x81698AA8; // type:object size:0x4 data:4byte
|
||||
CoverOpenTimeLow = .sbss:0x81698AAC; // type:object size:0x4 data:4byte
|
||||
CoverOpenTime = .sbss:0x81698AA8; // type:object size:0x8 data:4byte
|
||||
NandTransferred = .sbss:0x81698AB0; // type:object size:0x4 data:4byte
|
||||
NandLength = .sbss:0x81698AB4; // type:object size:0x4 data:4byte
|
||||
NandBuffer = .sbss:0x81698AB8; // type:object size:0x4 data:4byte
|
||||
|
||||
93
configure.py
93
configure.py
@@ -455,7 +455,7 @@ def IPLSection(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
|
||||
def ZI8Lib(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
|
||||
return {
|
||||
"lib": lib_name,
|
||||
"mw_version": config.linker_version,
|
||||
"mw_version": "GC/3.0a5",
|
||||
"cflags": cflags_zi8,
|
||||
"progress_category": "rvlmwm",
|
||||
"objects": objects,
|
||||
@@ -658,7 +658,7 @@ config.libs = [
|
||||
Object(Matching, "system/iplChannelRsoThread.cpp"),
|
||||
Object(Matching, "system/RsoSystem.cpp"),
|
||||
Object(Matching, "system/iplCdbBackup.cpp"),
|
||||
Object(NonMatching, "system/odh.cpp"),
|
||||
Object(Matching, "system/odh.cpp"),
|
||||
Object(Matching, "system/iplSDVFWorker.cpp"),
|
||||
Object(Matching, "system/iplNandWrapper.cpp"),
|
||||
Object(Matching, "system/main.cpp"),
|
||||
@@ -678,7 +678,7 @@ config.libs = [
|
||||
Object(Matching, "utility/iplThread.cpp"),
|
||||
Object(Matching, "utility/iplMessageBase.cpp"),
|
||||
Object(Matching, "utility/iplJpegDecoder.cpp"),
|
||||
Object(NonMatching, "utility/iplESMisc.cpp"),
|
||||
Object(Matching, "utility/iplESMisc.cpp"),
|
||||
Object(Matching, "utility/iplCSFlags.cpp"),
|
||||
]
|
||||
),
|
||||
@@ -700,7 +700,7 @@ config.libs = [
|
||||
Object(Matching, "iplwww/www_print.cpp"),
|
||||
Object(Matching, "iplwww/www_window.cpp"),
|
||||
Object(Matching, "iplwww/www_trasition.cpp"),
|
||||
Object(Equivalent, "iplwww/www_wiisetting.cpp"),
|
||||
Object(Matching, "iplwww/www_wiisetting.cpp"),
|
||||
Object(Matching, "iplwww/www_arcreader.cpp"),
|
||||
]
|
||||
),
|
||||
@@ -718,8 +718,8 @@ config.libs = [
|
||||
Object(Matching, "BS2/BS2Entry.c"),
|
||||
Object(Matching, "BS2/BS2.c"),
|
||||
Object(Matching, "BS2/BS2Init.c"),
|
||||
Object(NonMatching, "BS2/BS2Mach.c"),
|
||||
Object(NonMatching, "BS2/BS2Update.c"),
|
||||
Object(Matching, "BS2/BS2Mach.c"),
|
||||
Object(Matching, "BS2/BS2Update.c"),
|
||||
Object(Matching, "BS2/BS2ParentalControl.c"),
|
||||
Object(Matching, "BS2/BS2BringUp.c"),
|
||||
Object(Matching, "BS2/BS2Reset.c"),
|
||||
@@ -729,7 +729,7 @@ config.libs = [
|
||||
IPLSection("address", [
|
||||
Object(Matching, "scene/address/iplAddress.cpp"),
|
||||
Object(Matching, "scene/address/iplAddressAddSel.cpp"),
|
||||
Object(NonMatching, "scene/address/iplAddressEdit.cpp"),
|
||||
Object(Matching, "scene/address/iplAddressEdit.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("backMenu", [
|
||||
@@ -814,7 +814,7 @@ config.libs = [
|
||||
IPLSection("memoryCard", [
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCWindow.cpp"),
|
||||
]
|
||||
@@ -824,7 +824,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("cardSequence", [
|
||||
Object(NonMatching, "scene/cardSequence/iplCardSequence.cpp"),
|
||||
Object(Matching, "scene/cardSequence/iplCardSequence.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("nakamuraTest", [
|
||||
@@ -849,12 +849,12 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("sdChannelSelect", [
|
||||
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelSelect.cpp"),
|
||||
Object(Matching, "scene/sdChannelSelect/iplSDChannelSelect.cpp"),
|
||||
Object(Matching, "scene/sdChannelSelect/iplSDChannelObj.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("sdChannelTitle", [
|
||||
Object(NonMatching, "scene/sdChannelTitle/iplSDChannelTitle.cpp"),
|
||||
Object(Matching, "scene/sdChannelTitle/iplSDChannelTitle.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("sdButton", [
|
||||
@@ -864,11 +864,11 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("sdChannelMemory", [
|
||||
Object(NonMatching, "scene/sdChannelMemory/iplSDMemory.cpp"),
|
||||
Object(Matching, "scene/sdChannelMemory/iplSDMemory.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("setting", [
|
||||
Object(NonMatching, "scene/setting/iplSetting.cpp"),
|
||||
Object(Matching, "scene/setting/iplSetting.cpp"),
|
||||
Object(Matching, "scene/setting/iplSensitivity.cpp"),
|
||||
Object(Matching, "scene/setting/iplNCDSetting.cpp"),
|
||||
Object(Matching, "scene/setting/iplParental.cpp"),
|
||||
@@ -876,10 +876,11 @@ config.libs = [
|
||||
Object(Matching, "scene/setting/iplUSBAP.cpp"),
|
||||
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||
Object(Matching, "scene/setting/AOSSLink.c"),
|
||||
Object(Matching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline on"]),
|
||||
Object(Matching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline on,noauto"]),
|
||||
Object(Matching, "scene/setting/AOSSData.c"),
|
||||
Object(Matching, "scene/setting/ATERM.c", mw_version="GC/3.0a5", extra_cflags=["-O4,p", "-inline on"]),
|
||||
]
|
||||
),
|
||||
IPLSection("settingSelect", [
|
||||
@@ -910,14 +911,14 @@ config.libs = [
|
||||
IPLSection("keyboard", [
|
||||
Object(Matching, "keyboard/tiPcKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiCellPhone.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiCandidateBox.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiCandidateBox.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiToolBar.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiPredictLang.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiSignWindow.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
||||
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||
Object(Matching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -941,7 +942,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("channelScript", [
|
||||
Object(NonMatching, "channelScript/CHANSVm.c"),
|
||||
Object(Matching, "channelScript/CHANSVm.c"),
|
||||
Object(Matching, "channelScript/systemmenu/VmSystem.c"),
|
||||
Object(Matching, "channelScript/systemmenu/iplCSSystem.cpp"),
|
||||
Object(Matching, "channelScript/systemmenu/iplCSLayout.cpp"),
|
||||
@@ -983,34 +984,34 @@ config.libs = [
|
||||
ZI8Lib("zi8clib", [
|
||||
Object(Matching, "clib/zaddress.c"),
|
||||
Object(Matching, "clib/zconvert.c"),
|
||||
Object(NonMatching, "clib/zi81key.c"),
|
||||
Object(NonMatching, "clib/zi8alpha.c"),
|
||||
Object(Matching, "clib/zi81key.c"),
|
||||
Object(Matching, "clib/zi8alpha.c"),
|
||||
Object(Matching, "clib/zi8alts.c"),
|
||||
Object(NonMatching, "clib/zi8cgetc.c"),
|
||||
Object(Matching, "clib/zi8cgetc.c"),
|
||||
Object(Matching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8copy.c"),
|
||||
Object(Matching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
Object(NonMatching, "clib/zi8getc2.c"),
|
||||
Object(Matching, "clib/zi8getc2.c"),
|
||||
Object(Matching, "clib/zi8getSW.c"),
|
||||
Object(Matching, "clib/zi8initd.c"),
|
||||
Object(Matching, "clib/zi8is.c"),
|
||||
Object(NonMatching, "clib/zi8match.c"),
|
||||
Object(Matching, "clib/zi8match.c"),
|
||||
Object(Matching, "clib/zi8misc.c"),
|
||||
Object(Matching, "clib/zi8pud2.c"),
|
||||
Object(Matching, "clib/Zi8punct.c"),
|
||||
Object(Matching, "clib/zi8space.c"),
|
||||
Object(NonMatching, "clib/zi8uwd.c"),
|
||||
Object(Matching, "clib/zi8uwd.c"),
|
||||
Object(Matching, "clib/zi8ver.c"),
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(Matching, "clib/zidawg1.c"),
|
||||
Object(Matching, "clib/zikorean.c"),
|
||||
Object(Matching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zierror.c"),
|
||||
Object(NonMatching, "clib/zmtkey.c"),
|
||||
Object(NonMatching, "clib/zoemdata.c"),
|
||||
Object(NonMatching, "clib/zprepare.c"),
|
||||
Object(Matching, "clib/zmtkey.c"),
|
||||
Object(Matching, "clib/zoemdata.c"),
|
||||
Object(Matching, "clib/zprepare.c"),
|
||||
]
|
||||
),
|
||||
# RevoEX
|
||||
@@ -1048,7 +1049,7 @@ config.libs = [
|
||||
Object(Matching, "net/hmac.c"),
|
||||
Object(Matching, "net/neterrorcode.c"),
|
||||
Object(Matching, "net/NETVersion.c"),
|
||||
Object(NonMatching, "net/aes.c"),
|
||||
Object(Matching, "net/aes.c"),
|
||||
Object(Matching, "net/wireless_macaddr.c"),
|
||||
]
|
||||
),
|
||||
@@ -1057,11 +1058,11 @@ config.libs = [
|
||||
Object(Matching, "nhttp/NHTTP_control.c"),
|
||||
Object(Matching, "nhttp/NHTTP_list.c"),
|
||||
Object(Matching, "nhttp/NHTTP_os_RVL.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_recvbuf.c"),
|
||||
Object(Matching, "nhttp/NHTTP_recvbuf.c", mw_version="GC/3.0a5"),
|
||||
Object(Matching, "nhttp/NHTTP_request.c"),
|
||||
Object(Matching, "nhttp/NHTTP_response.c"),
|
||||
Object(Matching, "nhttp/NHTTP_socket_RVL.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
|
||||
Object(Matching, "nhttp/NHTTP_stdlib_RVL.c", mw_version="GC/3.0a5"),
|
||||
Object(Matching, "nhttp/NHTTP_thread.c"),
|
||||
Object(Matching, "nhttp/d_nhttp_private.c"),
|
||||
Object(Matching, "nhttp/d_nhttp.c"),
|
||||
@@ -1096,7 +1097,7 @@ config.libs = [
|
||||
),
|
||||
RevoEXLib("so", [
|
||||
Object(Matching, "so/SOCommon.c"),
|
||||
Object(NonMatching, "so/SOBasic.c"),
|
||||
Object(Matching, "so/SOBasic.c"),
|
||||
Object(Matching, "so/SOInformation.c"),
|
||||
Object(Matching, "so/SOOption.c"),
|
||||
]
|
||||
@@ -1201,7 +1202,7 @@ config.libs = [
|
||||
Object(Matching, "buffer/mkhdec3.c"),
|
||||
Object(Matching, "buffer/buffer_system.c"),
|
||||
Object(Matching, "buffer/getcode.c"),
|
||||
Object(NonMatching, "buffer/idct_block_var.c"),
|
||||
Object(Matching, "buffer/idct_block_var.c"),
|
||||
|
||||
Object(Matching, "api/decapi.c"),
|
||||
|
||||
@@ -1209,14 +1210,14 @@ config.libs = [
|
||||
Object(Matching, "jpegdec/jdec_main.c"),
|
||||
Object(Matching, "jpegdec/jpformat.c"),
|
||||
|
||||
Object(NonMatching, "exif/exif_parse.c"),
|
||||
Object(Matching, "exif/exif_parse.c"),
|
||||
|
||||
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
|
||||
Object(Matching, "reschange/idct_resolution_change_var.c"),
|
||||
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGBA8.c"),
|
||||
Object(Matching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
|
||||
Object(Matching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
||||
Object(Matching, "texturecvtr/Texture_MCUtoRGBA8.c"),
|
||||
|
||||
Object(Matching, "b65/iqdec_b65_frv32.c"),
|
||||
]
|
||||
@@ -1323,7 +1324,7 @@ config.libs = [
|
||||
Object(Matching, "lyt/lyt_layout.cpp"),
|
||||
Object(Matching, "lyt/lyt_picture.cpp"),
|
||||
Object(Matching, "lyt/lyt_textBox.cpp"),
|
||||
Object(Equivalent, "lyt/lyt_window.cpp"),
|
||||
Object(Matching, "lyt/lyt_window.cpp"),
|
||||
Object(Matching, "lyt/lyt_bounding.cpp"),
|
||||
Object(Matching, "lyt/lyt_material.cpp"),
|
||||
Object(Matching, "lyt/lyt_drawinfo.cpp"),
|
||||
@@ -1690,7 +1691,7 @@ config.libs = [
|
||||
Object(Matching, "fa/pdm_api.c"),
|
||||
Object(Matching, "fa/pdm_bpb.c"),
|
||||
Object(Matching, "fa/pdm_disk.c"),
|
||||
Object(NonMatching, "fa/pdm_partition.c"),
|
||||
Object(Matching, "fa/pdm_partition.c"),
|
||||
Object(Matching, "fa/pf_cache.c"),
|
||||
Object(Matching, "fa/pf_cluster.c"),
|
||||
Object(Matching, "fa/pf_dir.c"),
|
||||
@@ -1854,7 +1855,7 @@ config.libs = [
|
||||
Object(Matching, "fa/kernel/pfk_api.c"),
|
||||
|
||||
Object(Matching, "fa/driver/nand_drv.c"),
|
||||
Object(NonMatching, "fa/driver/sd_drv.c"),
|
||||
Object(Matching, "fa/driver/sd_drv.c"),
|
||||
Object(Matching, "fa/driver/pfd_cmn.c"),
|
||||
Object(Matching, "fa/driver/msc_drv.c"),
|
||||
|
||||
@@ -1868,7 +1869,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("nup", [
|
||||
Object(NonMatching, "nup/nup.cpp"),
|
||||
Object(Matching, "nup/nup.cpp"),
|
||||
Object(Matching, "nup/nup_nhttp.cpp"),
|
||||
Object(Matching, "nup/nup_mem.cpp"),
|
||||
]
|
||||
@@ -1885,7 +1886,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("kbd", [
|
||||
Object(NonMatching, "kbd/kbd_lib.c"),
|
||||
Object(Matching, "kbd/kbd_lib.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_jp.c"),
|
||||
Object(Matching, "kbd/kbd_lib_map_us.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_eu.c"),
|
||||
|
||||
193
docs/asm-inventory.md
Normal file
193
docs/asm-inventory.md
Normal file
@@ -0,0 +1,193 @@
|
||||
# Assembly inventory
|
||||
|
||||
4.3U, 2026-10-09. 162 functions contain 164 assembly
|
||||
bodies/blocks: 162 ORIGINAL functions and 0 PLACEHOLDER functions.
|
||||
|
||||
Run `python3 tools/check_asm_inventory.py`. Completion requires exit 0, complete
|
||||
coverage and zero placeholders. The checker also rejects stale/duplicate rows,
|
||||
invalid classifications and syntax it cannot inspect.
|
||||
|
||||
Scope: C/C++ sources and headers in `src/` and `libs/`, including inactive
|
||||
platform branches, plus standalone assembly there or referenced by
|
||||
`configure.py`. There are currently no standalone assembly files in that scope.
|
||||
One row covers all blocks in a function; runtime save/restore entry labels belong
|
||||
to their enclosing assembly body. Names use their source spelling. Declarations,
|
||||
comments and string contents do not count.
|
||||
|
||||
ORIGINAL requires hardware, startup, runtime or original SDK assembly evidence.
|
||||
An SDK path, `nofralloc` alone or an exact assembled object proves no C conversion.
|
||||
The rvl_dec family follows the original decoder convention specified for this
|
||||
audit; ASH/ASR also show unsigned `lis @h`/`ori @l` address construction and
|
||||
hand-built `stmw` frames. C scores below are recorded rejected trials, not fresh
|
||||
measurements or scores of the retained assembly. Unrecorded means no C score was
|
||||
found. Historical audit logs are in git history.
|
||||
|
||||
| File | Function | Classification | Evidence |
|
||||
| --- | --- | --- | --- |
|
||||
| `libs/MetroTRK/src/Export/targsupp.c` | `TRKAccessFile` | ORIGINAL | twi 31,r0,0 is the debugger file-service trap, with debugger-controlled return registers. |
|
||||
| `libs/MetroTRK/src/Export/targsupp.c` | `TRKOpenFile` | ORIGINAL | twi 31,r0,0 is the debugger file-service trap, with debugger-controlled return registers. |
|
||||
| `libs/MetroTRK/src/Export/targsupp.c` | `TRKCloseFile` | ORIGINAL | twi 31,r0,0 is the debugger file-service trap, with debugger-controlled return registers. |
|
||||
| `libs/MetroTRK/src/Export/targsupp.c` | `TRKPositionFile` | ORIGINAL | twi 31,r0,0 is the debugger file-service trap, with debugger-controlled return registers. |
|
||||
| `libs/NW4R/include/nw4r/math/arithmetic.h` | `FSelect` | ORIGINAL | fsel inline assembly matches the public [NW4R arithmetic header][arithmetic-h]. |
|
||||
| `libs/NW4R/include/nw4r/math/arithmetic.h` | `FAbs` | ORIGINAL | fabs inline assembly matches the public [NW4R arithmetic header][arithmetic-h]. |
|
||||
| `libs/NW4R/include/nw4r/math/types.h` | `VEC3Add` | ORIGINAL | psq_l/ps_add/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/NW4R/include/nw4r/math/types.h` | `VEC3Sub` | ORIGINAL | psq_l/ps_sub/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/NW4R/include/nw4r/math/types.h` | `VEC3Scale` | ORIGINAL | psq_l/ps_muls0/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/NW4R/src/math/math_arithmetic.cpp` | `FrSqrt` | ORIGINAL | frsqrte plus fixed refinement matches the public [NW4R arithmetic assembly][arithmetic-cpp]. |
|
||||
| `libs/NW4R/src/math/math_types.cpp` | `MTX44Identity` | ORIGINAL | psq_st/ps_merge01/ps_merge10 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `OSInitFastCast` | ORIGINAL | mtspr programs the GQR quantization registers. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSu16tof32` | ORIGINAL | psq_l uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSf32tou8` | ORIGINAL | psq_st uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSf32tou16` | ORIGINAL | psq_st uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSs16tof32` | ORIGINAL | psq_l uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/include/revolution/os/OSFastCast.h` | `__OSf32tos16` | ORIGINAL | psq_st uses a GQR integer conversion format for the fast cast. |
|
||||
| `libs/RVL_SDK/src/ai/ai.c` | `__AICallbackStackSwitch` | ORIGINAL | Saves r1 to __OldStack, installs __CallbackStack, calls through LR, then restores r1. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfmsr` | ORIGINAL | Special-register or synchronization operation: `mfmsr r3`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtmsr` | ORIGINAL | Special-register or synchronization operation: `mtmsr newMSR`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCOrMsr` | ORIGINAL | Special-register or synchronization operation: `mfmsr r4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCAndMsr` | ORIGINAL | Special-register or synchronization operation: `mfmsr r4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCAndCMsr` | ORIGINAL | Special-register or synchronization operation: `mfmsr r4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfhid0` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, HID0`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMthid0` | ORIGINAL | Special-register or synchronization operation: `mtspr HID0, newHID0`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfhid1` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, HID1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfl2cr` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, L2CR`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtl2cr` | ORIGINAL | Special-register or synchronization operation: `mtspr L2CR, newL2cr`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtdec` | ORIGINAL | Special-register or synchronization operation: `mtdec newDec`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfdec` | ORIGINAL | Special-register or synchronization operation: `mfdec r3`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCSync` | ORIGINAL | Special-register or synchronization operation: `sc`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCEieio` | ORIGINAL | Special-register or synchronization operation: `mfmsr r5`, `mtmsr r6`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCHalt` | ORIGINAL | Special-register or synchronization operation: `sync`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfmmcr0` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, MMCR0`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtmmcr0` | ORIGINAL | Special-register or synchronization operation: `mtspr MMCR0, newMmcr0`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfmmcr1` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, MMCR1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtmmcr1` | ORIGINAL | Special-register or synchronization operation: `mtspr MMCR1, newMmcr1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpmc1` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PMC1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtpmc1` | ORIGINAL | Special-register or synchronization operation: `mtspr PMC1, newPmc1`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpmc2` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PMC2`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtpmc2` | ORIGINAL | Special-register or synchronization operation: `mtspr PMC2, newPmc2`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpmc3` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PMC3`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtpmc3` | ORIGINAL | Special-register or synchronization operation: `mtspr PMC3, newPmc3`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpmc4` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PMC4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtpmc4` | ORIGINAL | Special-register or synchronization operation: `mtspr PMC4, newPmc4`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMffpscr` | ORIGINAL | Special-register or synchronization operation: `mffs fp31`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfsia` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, SIA`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtsia` | ORIGINAL | Special-register or synchronization operation: `mtspr SIA, newSia`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtfpscr` | ORIGINAL | Special-register or synchronization operation: `mtfsf 0xff, fp31`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfhid2` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, HID2`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMthid2` | ORIGINAL | Special-register or synchronization operation: `mtspr HID2, newhid2`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfwpar` | ORIGINAL | Special-register or synchronization operation: `sync`, `mfspr r3, WPAR`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtwpar` | ORIGINAL | Special-register or synchronization operation: `mtspr WPAR, newwpar`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfdmaU` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, DMA_U`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfdmaL` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, DMA_L`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtdmaU` | ORIGINAL | Special-register or synchronization operation: `mtspr DMA_U, newdmau`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMtdmaL` | ORIGINAL | Special-register or synchronization operation: `mtspr DMA_L, newdmal`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMfpvr` | ORIGINAL | Special-register or synchronization operation: `mfspr r3, PVR`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCSetFpIEEEMode` | ORIGINAL | Special-register or synchronization operation: `mtfsb0 FPSCR_NI_BIT`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCSetFpNonIEEEMode` | ORIGINAL | Special-register or synchronization operation: `mtfsb1 FPSCR_NI_BIT`. |
|
||||
| `libs/RVL_SDK/src/base/PPCArch.c` | `PPCMthid4` | ORIGINAL | Both branches write HID4 with mtspr; the fallback preserves the Broadway H4A bit. |
|
||||
| `libs/RVL_SDK/src/db/db.c` | `__DBExceptionDestination` | ORIGINAL | mfmsr/mtmsr enable address translation before the exception-handler tail branch. |
|
||||
| `libs/RVL_SDK/src/gx/GXLight.c` | `PushLight` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `WriteProjPS` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `Copy6Floats` | ORIGINAL | psq_l/psq_st copies three pairs of floats. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `WriteMTXPS4x3` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `WriteMTXPS3x3from3x4` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/gx/GXTransform.c` | `WriteMTXPS4x2` | ORIGINAL | psq_l/psq_st transfers paired-single values for the GX command stream. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXIdentity` | ORIGINAL | psq_st/ps_merge01/ps_merge10 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXCopy` | ORIGINAL | psq_l/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXConcat` | ORIGINAL | psq_l/ps_muls0/ps_madds1/ps_madds0 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXInverse` | ORIGINAL | psq_l/ps_merge10/ps_mul/ps_msub implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXInvXpose` | ORIGINAL | psq_l/ps_merge10/ps_mul/ps_msub implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXRotTrig` | ORIGINAL | Two blocks use frsp, ps_neg, ps_merge00 and psq_st to construct a paired-single rotation. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXTrans` | ORIGINAL | psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXTransApply` | ORIGINAL | psq_l/psq_st/ps_sum1 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXScale` | ORIGINAL | psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtx.c` | `PSMTXScaleApply` | ORIGINAL | psq_l/ps_muls0/psq_st implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/mtxvec.c` | `PSMTXMultVec` | ORIGINAL | psq_l/ps_mul/ps_madd/ps_sum0 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/vec.c` | `PSVECNormalize` | ORIGINAL | psq_l/ps_mul/ps_madd/ps_sum0 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/mtx/vec.c` | `PSVECCrossProduct` | ORIGINAL | psq_l/ps_merge10/ps_mul/ps_muls0 implements paired-single vector/matrix operations. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `__OSFPRInit` | ORIGINAL | mfmsr/mtmsr enable the FPU; psq_l initializes paired registers and mtfsf initializes FPSCR. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `__OSDBIntegrator` | ORIGINAL | nofralloc debug-vector fragment changes MSR and transfers through the saved hook LR. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `__OSDBJump` | ORIGINAL | Single absolute bla __OSDBJumpTarget between entry labels copied into exception vectors. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `OSExceptionVector` | ORIGINAL | Saves interrupted state, sets SRR0/SRR1 and executes rfi into the exception handler. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `OSDefaultExceptionHandler` | ORIGINAL | Captures GQR1..7 with mfspr and interrupted r13..31 with stmw before dispatch. |
|
||||
| `libs/RVL_SDK/src/os/OS.c` | `__OSPSInit` | ORIGINAL | mtspr initializes GQR0..7 for paired-single quantization. |
|
||||
| `libs/RVL_SDK/src/os/OSAlarm.c` | `DecrementerExceptionHandler` | ORIGINAL | Saves interrupted GPRs and GQR1..7 via stmw/mfspr before the C callback. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCEnable` | ORIGINAL | sync and HID0 mfspr/mtspr enable the data cache. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCInvalidateRange` | ORIGINAL | dcbi invalidates each cache line. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCFlushRange` | ORIGINAL | dcbf flushes cache lines; sc invokes the synchronization vector. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCStoreRange` | ORIGINAL | dcbst writes cache lines; sc invokes the synchronization vector. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCFlushRangeNoSync` | ORIGINAL | dcbf flushes cache lines without the synchronization call. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `DCZeroRange` | ORIGINAL | dcbz zeroes each cache line. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `ICInvalidateRange` | ORIGINAL | icbi invalidates instructions, followed by sync/isync. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `ICFlashInvalidate` | ORIGINAL | HID0 mfspr/mtspr triggers instruction-cache flash invalidation. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `ICEnable` | ORIGINAL | isync and HID0 mfspr/mtspr enable the instruction cache. |
|
||||
| `libs/RVL_SDK/src/os/OSCache.c` | `LCDisable` | ORIGINAL | dcbi clears locked-cache lines; HID2 mfspr/mtspr disables the locked cache. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `__OSLoadFPUContext` | ORIGINAL | Restores caller FPRs, FPSCR and paired-single halves using mtfsf/psq_l. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `__OSSaveFPUContext` | ORIGINAL | Captures caller FPSCR/FPRs and paired-single halves using mffs/psq_st. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSLoadFPUContext` | ORIGINAL | Moves context to r4 and tail-branches to __OSLoadFPUContext, which replaces caller FPRs. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSaveFPUContext` | ORIGINAL | Moves context to r5 and tail-branches to __OSSaveFPUContext before caller FPRs change. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSetCurrentContext` | ORIGINAL | mfmsr/mtmsr/isync change the FPU-enable bit while installing context pointers. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSaveContext` | ORIGINAL | Captures caller r1/r2, GPRs, GQR1..7, CR, LR, XER and MSR for a later nonlocal return. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSLoadContext` | ORIGINAL | Restores GPRs and GQR1..7, sets SRR0/SRR1 and resumes interrupted execution with rfi. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSGetStackPointer` | ORIGINAL | nofralloc leaf returns the caller stack pointer directly with mr r3,r1. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSwitchStack` | ORIGINAL | Returns the old r1 and installs the supplied stack pointer directly. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSwitchFiber` | ORIGINAL | Installs another r1 and calls the supplied PC through LR; restores the old stack afterward. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSwitchFiberEx` | ORIGINAL | Preserves r3..r6 arguments while switching r1 and calling the supplied PC through LR. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSInitContext` | ORIGINAL | Copies live ABI registers r2/r13 directly and seeds SRR state for a new execution context. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSSwitchFPUContext` | ORIGINAL | mfmsr/mtmsr/isync enable the FPU; the exception path restores SRR state and uses rfi. |
|
||||
| `libs/RVL_SDK/src/os/OSContext.c` | `OSFillFPUContext` | ORIGINAL | mfmsr/mtmsr/isync enable the FPU before mffs and paired-single register saves. |
|
||||
| `libs/RVL_SDK/src/os/OSInterrupt.c` | `OSDisableInterrupts` | ORIGINAL | mfmsr/mtmsr read and clear MSR_EE atomically within the restartable sequence. |
|
||||
| `libs/RVL_SDK/src/os/OSInterrupt.c` | `OSEnableInterrupts` | ORIGINAL | mfmsr/mtmsr read and set MSR_EE. |
|
||||
| `libs/RVL_SDK/src/os/OSInterrupt.c` | `OSRestoreInterrupts` | ORIGINAL | mfmsr/mtmsr replace MSR_EE with the saved interrupt state. |
|
||||
| `libs/RVL_SDK/src/os/OSInterrupt.c` | `ExternalInterruptHandler` | ORIGINAL | Captures interrupted GPRs and GQR1..7 with stmw/mfspr before C interrupt dispatch. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM1_24MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM1_48MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_52MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_56MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_64MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_112MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM2_128MB` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `ConfigMEM_ES1_0` | ORIGINAL | isync and mtspr program IBAT/DBAT mappings; SRR0/SRR1 and rfi return with translation enabled. |
|
||||
| `libs/RVL_SDK/src/os/OSMemory.c` | `RealMode` | ORIGINAL | Writes SRR0/SRR1 and executes rfi with address translation disabled. |
|
||||
| `libs/RVL_SDK/src/os/OSSync.c` | `SystemCallVector` | ORIGINAL | Changes HID0 with mfspr/mtspr around sync/isync, then returns with rfi. |
|
||||
| `libs/RVL_SDK/src/os/OSTime.c` | `OSGetTime` | ORIGINAL | mftbu/mftb/mftbu retries until the upper time-base word is stable. |
|
||||
| `libs/RVL_SDK/src/os/OSTime.c` | `OSGetTick` | ORIGINAL | mftb reads the hardware time-base register. |
|
||||
| `libs/RVL_SDK/src/os/OSTime.c` | `__SetTime` | ORIGINAL | mttbl/mttbu/mttbl updates the hardware time base in a fixed sequence. |
|
||||
| `libs/RVL_SDK/src/os/__ppc_eabi_init.cpp` | `__init_hardware` | ORIGINAL | Before normal C startup, mfmsr/mtmsr enables the FPU and r31 holds LR across init calls. |
|
||||
| `libs/RVL_SDK/src/os/__ppc_eabi_init.cpp` | `__flush_cache` | ORIGINAL | dcbst/sync/icbi/isync make freshly initialized code visible to instruction fetch. |
|
||||
| `libs/RVL_SDK/src/os/__ppc_eabi_init.cpp` | `__init_user` | ORIGINAL | fralloc/bl __init_cpp/frfree/blr matches the public [SDK startup assembly][sdk-init]. |
|
||||
| `libs/Runtime/src/Gecko_setjmp.c` | `__setjmp` | ORIGINAL | Saves or restores caller GPRs/FPRs, LR, CR, and stack state across nonlocal returns. |
|
||||
| `libs/Runtime/src/Gecko_setjmp.c` | `longjmp` | ORIGINAL | Saves or restores caller GPRs/FPRs, LR, CR, and stack state across nonlocal returns. |
|
||||
| `libs/Runtime/src/__init_cpp_exceptions.cpp` | `__exception_info_constants` | ORIGINAL | Reads the caller ABI TOC register r2 directly for exception registration. |
|
||||
| `libs/Runtime/src/ptmf.c` | `__ptmf_scall` | ORIGINAL | Special compiler ABI takes the member-function descriptor in r12 and tail-dispatches through CTR. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_fp2unsigned` | ORIGINAL | Unsigned conversion runtime helper with explicit CR0/CR6/CR7 tests; [public runtime assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__save_fpr` | ORIGINAL | Entry labels _savefpr_14..31 store caller FPRs relative to r11 without an ABI call frame. |
|
||||
| `libs/Runtime/src/runtime.c` | `__restore_fpr` | ORIGINAL | Entry labels _restfpr_14..31 reload caller FPRs relative to r11 without an ABI call frame. |
|
||||
| `libs/Runtime/src/runtime.c` | `__save_gpr` | ORIGINAL | Entry labels _savegpr_14..31 store caller GPRs relative to r11 without an ABI call frame. |
|
||||
| `libs/Runtime/src/runtime.c` | `__restore_gpr` | ORIGINAL | Entry labels _restgpr_14..31 reload caller GPRs relative to r11 without an ABI call frame. |
|
||||
| `libs/Runtime/src/runtime.c` | `__div2u` | ORIGINAL | 64-bit compiler division helper uses r3:r4/r5:r6 and carry chains; [public assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__div2i` | ORIGINAL | Signed 64-bit compiler division helper manages register-pair signs/carry; [public assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__mod2u` | ORIGINAL | 64-bit compiler remainder helper uses register-pair restoring division; [public assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__mod2i` | ORIGINAL | Signed 64-bit compiler remainder helper manages register-pair signs/carry; [public assembly][runtime]. |
|
||||
| `libs/Runtime/src/runtime.c` | `__shl2i` | ORIGINAL | Compiler helper shifts r3:r4 by r5 without recursively calling the 64-bit shift helper. |
|
||||
| `libs/Runtime/src/runtime.c` | `__shr2u` | ORIGINAL | Compiler helper shifts unsigned r3:r4 by r5 across the word boundary. |
|
||||
| `libs/Runtime/src/runtime.c` | `__shr2i` | ORIGINAL | Compiler helper shifts signed r3:r4 by r5, explicitly propagating the sign. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_sll_dbl` | ORIGINAL | Compiler conversion ABI uses r3:r4 input and f1 result with explicit carry/rounding. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_ull_dbl` | ORIGINAL | Compiler conversion ABI uses r3:r4 input and f1 result with explicit carry/rounding. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_ull_flt` | ORIGINAL | Compiler conversion ABI uses r3:r4 input and f1 result with explicit single-precision rounding. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_dbl_usll` | ORIGINAL | Compiler conversion ABI uses f1 input and r3:r4 result without a recursive conversion call. |
|
||||
| `libs/Runtime/src/runtime.c` | `__cvt_dbl_ull` | ORIGINAL | Compiler conversion helper decodes f1 into r3:r4; [public runtime assembly][runtime]. |
|
||||
| `src/BS2/BS2Init.c` | `ClearOtherBATs` | ORIGINAL | isync and direct IBAT/DBAT register writes. |
|
||||
| `src/BS2/BS2Mach.c` | `Run` | ORIGINAL | Clears ABI registers, replaces r1, uses dcbz/dcbf, and jumps via LR. |
|
||||
| `src/BS2/BS2Start.c` | `__start` | ORIGINAL | Runs before the C stack and ABI registers exist; constructs the initial stack. |
|
||||
| `src/BS2/BS2Start.c` | `__init_registers` | ORIGINAL | Initializes GPRs, r1, r2, and r13 for the C runtime. |
|
||||
| `src/scene/nakamuraTest/gamespy/common/gsPlatformUtil.c` | `GetTicks` | ORIGINAL | Inactive PS2 branch reads the CP0 Count register with mfc0 $9. |
|
||||
| `src/system/rvl_dec.c` | `Rvl_decode` | ORIGINAL | Direct beq decoder entries preserve r3/r4 and LR; lis/ori builds the format signatures. |
|
||||
| `src/system/rvl_dec.c` | `Rvl_decode_szs` | ORIGINAL | Original SZS decoder convention: nofralloc, r0 retains output length, fixed r3..r10/CTR byte-copy pipeline. |
|
||||
| `src/system/rvl_dec.c` | `Rvl_decode_ash` | ORIGINAL | nofralloc hand-built 0x40 frame saves r21..31 with stmw; work address uses lis @h/ori @l. |
|
||||
| `src/system/rvl_dec.c` | `Rvl_decode_asr` | ORIGINAL | nofralloc hand-built 0x40 frame saves r21..31 with stmw; work address uses lis @h/ori @l. |
|
||||
|
||||
[sdk-init]: https://github.com/doldecomp/ogws/blob/master/src/revolution/OS/__ppc_eabi_init.c
|
||||
[runtime]: https://github.com/doldecomp/ogws/blob/master/src/runtime/runtime.c
|
||||
[arithmetic-h]: https://github.com/doldecomp/ogws/blob/master/include/nw4r/math/math_arithmetic.h
|
||||
[arithmetic-cpp]: https://github.com/doldecomp/ogws/blob/master/src/nw4r/math/math_arithmetic.cpp
|
||||
@@ -19,7 +19,7 @@ extern "C" {
|
||||
#define CHANS_VM_CLASS_NAME_LEN 32
|
||||
|
||||
CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size);
|
||||
CHANSVmErr CHANSVmLinkModules(CHANSVm* vm, vmS32 unk0);
|
||||
CHANSVmErr CHANSVmLinkModules(CHANSVm* vm, vmS32 reserved);
|
||||
|
||||
void CHANSVmSetSignal(CHANSVm* vm, vmBool* signal);
|
||||
|
||||
@@ -30,7 +30,7 @@ void CHANSVmSetSignal(CHANSVm* vm, vmBool* signal);
|
||||
vmU32 CHANSVmGetFreeExeSize(CHANSVm* vm);
|
||||
vmPtr CHANSVmGetFreeExeBufp(CHANSVm* vm);
|
||||
|
||||
CHANSVmErr CHANSVmAddExe(CHANSVm* vm, vmS32 unk0, CHANSVm* execCtx);
|
||||
CHANSVmErr CHANSVmAddExe(CHANSVm* vm, vmS32 reserved, CHANSVm* execCtx);
|
||||
|
||||
CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount);
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef CHANSVmObjHdr* (*VmConvertFunc)(CHANSVm*, CHANSVmObjType, CHANSVmObjHdr*);
|
||||
typedef CHANSVmObjHdr* (*VmConvertFunc)(CHANSVm*, CHANSVmObjType, const CHANSVmObjHdr*);
|
||||
|
||||
typedef struct VmConvertEntry {
|
||||
VmConvertFunc convFunc[6]; // 0x00
|
||||
|
||||
@@ -12,6 +12,7 @@ extern void __sync();
|
||||
extern unsigned int __cntlzw(unsigned int value);
|
||||
extern void __memclr(void* buffer, int len);
|
||||
extern unsigned int __rlwimi(unsigned int a, unsigned int b, unsigned int c, unsigned int d, unsigned int e);
|
||||
extern unsigned int __rlwinm(unsigned int value, unsigned int shift, unsigned int maskBegin, unsigned int maskEnd);
|
||||
extern void* __alloca(unsigned int blockSize);
|
||||
extern int __abs(int n);
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace ipl {
|
||||
volatile u16 size; // 0x02
|
||||
u8 canCopy; // 0x04
|
||||
u8 canMove; // 0x05
|
||||
u16 unk_0x06; // 0x06
|
||||
u16 transferBlocked; // 0x06
|
||||
u32 key; // 0x08
|
||||
} FileInfo; // 0x0C
|
||||
|
||||
@@ -21,21 +21,21 @@ namespace ipl {
|
||||
vu16 reservedSlot; // 0x04
|
||||
vu16 reservedCommand; // 0x06
|
||||
vu32 key; // 0x08
|
||||
vu16 unk_0x0C; // 0x0C
|
||||
vu16 unk_0x0E; // 0x0E
|
||||
vu16 totalBlocks; // 0x0C
|
||||
vu16 freeFiles; // 0x0E
|
||||
vu16 freeBlocks; // 0x10
|
||||
vu16 unk_0x12; // 0x12
|
||||
vu16 titleBlocks; // 0x12
|
||||
} CardState; // 0x14
|
||||
|
||||
typedef struct IconState {
|
||||
volatile u8 bannerEnable; // 0x00
|
||||
u8 unk_0x01; // 0x01
|
||||
u8 unk_0x02; // 0x02
|
||||
u8 iconEnable; // 0x01
|
||||
u8 iconCount; // 0x02
|
||||
u8 bannerType; // 0x03
|
||||
s8 anmDelta; // 0x04
|
||||
u8 anmType; // 0x05
|
||||
u8 unk_0x06; // 0x06
|
||||
u8 unk_0x07; // 0x07
|
||||
u8 anmFirstFrameDuration; // 0x06
|
||||
u8 anmLastFrameDuration; // 0x07
|
||||
u8 iconFmt[8]; // 0x08
|
||||
#ifdef IPL_MEMORY_CARD_MANAGER_CPP
|
||||
volatile u16 anmFrameBits;
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace textinput {
|
||||
|
||||
class Base : public CommandSender {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TI_CANDIDATEBOX_SAMPLE_CLASS)
|
||||
Base(Manager* manager) : mpCandidates(NULL), mpAllocator(NULL), mbOn(false), mbInvalid(true), meLanguage(USA), mpManager(manager) {}
|
||||
#endif
|
||||
virtual ~Base();
|
||||
@@ -114,7 +114,7 @@ namespace textinput {
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TI_CANDIDATEBOX_SAMPLE_CLASS)
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
#endif
|
||||
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, Input* input) override; // 0x18
|
||||
@@ -302,7 +302,7 @@ namespace textinput {
|
||||
// TODO
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public UIObj::Listener {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TI_CANDIDATEBOX_SAMPLE_CLASS)
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mEventHandler(this), mpTiString(NULL),
|
||||
mTextArea(0, this, this), mLeftScroll(1, this, this), mRightScroll(2, this, this), mOnOffButton(3, this, this),
|
||||
@@ -371,6 +371,15 @@ namespace textinput {
|
||||
bool mbActive;
|
||||
};
|
||||
|
||||
#ifdef TI_CANDIDATEBOX_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: LayoutByNW4R(manager, accessor, observer, layoutName) {}
|
||||
virtual ~Sample() {}
|
||||
};
|
||||
#endif
|
||||
|
||||
class CandidateTextAnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
CandidateTextAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
|
||||
@@ -178,8 +178,14 @@ namespace textinput {
|
||||
void inputCharZi_(wchar_t character, u32 modifiers);
|
||||
void inputCharDefault_(wchar_t character, u32 modifiers);
|
||||
void inputInputting_(wchar_t character);
|
||||
inline bool hasZiPredictions() const;
|
||||
inline bool usesZiPrediction() const;
|
||||
bool hasZiPredictions() const;
|
||||
bool usesZiPrediction() const;
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void checkUnfixConverting_();
|
||||
void setAtokMode_(bool fixMode, bool kanaMode);
|
||||
void trimString_(u32 length);
|
||||
void startConverting_();
|
||||
#endif
|
||||
inline void resetPredictionContext();
|
||||
inline void resetInputRelation();
|
||||
#endif
|
||||
@@ -356,6 +362,7 @@ namespace textinput {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
friend class EventHandler;
|
||||
inline const nw4r::lyt::Pane* getLanguageTextPane() const;
|
||||
inline nw4r::lyt::TextBox* getTextBox() const;
|
||||
#endif
|
||||
public:
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
|
||||
@@ -129,7 +129,7 @@ namespace textinput {
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
EventObserver* getEventObserverForHardware() const { return mpEventObserver; }
|
||||
#endif
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
#if defined(TISIGNWINDOW_IMPLEMENTATION) || defined(IPL_ADDRESS_EDIT_CPP)
|
||||
virtual InputForm* getInputForm();
|
||||
#else
|
||||
virtual InputForm* getInputForm() { return mpInputForm; }
|
||||
|
||||
@@ -85,10 +85,30 @@ namespace textinput {
|
||||
#endif
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION)
|
||||
virtual ~Decolated() {}
|
||||
#else
|
||||
virtual ~Decolated();
|
||||
#endif
|
||||
enum TranslateMode { TM_Direct, TM_Kana, TM_Roman, TM_Hangul };
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION)
|
||||
virtual void clear() {
|
||||
StringBase::clear();
|
||||
mCursorStart = 0;
|
||||
mCursorEnd = 0;
|
||||
mbSustain = false;
|
||||
initKanaConverter();
|
||||
}
|
||||
virtual void set(const wchar_t* string) {
|
||||
StringBase::set(string);
|
||||
u32 length = getLength();
|
||||
mCursorStart = length;
|
||||
mCursorEnd = length;
|
||||
}
|
||||
#else
|
||||
virtual void clear();
|
||||
virtual void set(const wchar_t* string);
|
||||
#endif
|
||||
virtual void setLength(u16 length);
|
||||
void setTranslateMode(TranslateMode mode);
|
||||
TranslateMode getTranslateMode() const { return static_cast<TranslateMode>(mTranslateMode); }
|
||||
@@ -194,6 +214,9 @@ namespace textinput {
|
||||
public:
|
||||
WithAtok(u16 maxLength) : Decolated(maxLength) {}
|
||||
virtual ~WithAtok();
|
||||
virtual bool isFix();
|
||||
virtual void setFix(bool fix);
|
||||
virtual void initConverting();
|
||||
virtual void pushBack(wchar_t ch);
|
||||
virtual void popBack();
|
||||
virtual void inputChar(wchar_t ch);
|
||||
@@ -209,9 +232,6 @@ namespace textinput {
|
||||
u32 selectedStart;
|
||||
u32 selectedEnd;
|
||||
};
|
||||
virtual bool isFix();
|
||||
virtual void setFix(bool fix);
|
||||
virtual void initConverting();
|
||||
virtual bool isConverting();
|
||||
virtual wchar_t* getConfirmedWCString() const;
|
||||
virtual int getCurrentNumPredicted();
|
||||
|
||||
@@ -47,8 +47,13 @@ namespace textinput {
|
||||
public :
|
||||
virtual ~Base() {}
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual void create(MEMAllocator* allocator) {}
|
||||
virtual void init() {}
|
||||
#else
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
#endif
|
||||
};
|
||||
|
||||
class CommandSender;
|
||||
@@ -59,8 +64,12 @@ namespace textinput {
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
CommandReceiver() { clearSender(); }
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual ~CommandReceiver() {}
|
||||
#else
|
||||
virtual ~CommandReceiver();
|
||||
#endif
|
||||
#endif
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
struct Scroll {
|
||||
bool absY;
|
||||
@@ -96,7 +105,11 @@ namespace textinput {
|
||||
#else
|
||||
virtual void sendCommand(u32, void*);
|
||||
#endif
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
virtual void updateFromReceiver(u32, void*);
|
||||
#else
|
||||
virtual void updateFromReceiver(u32, void*) {}
|
||||
#endif
|
||||
|
||||
nw4r::ut::Link mLink; // 0x00
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ namespace ipl {
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
template <typename T>
|
||||
class __declspec(novtable) HermiteIntp : public utility::FrameController {
|
||||
class HermiteIntp : public utility::FrameController {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
@@ -296,45 +296,6 @@ namespace ipl {
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
} // namespace math
|
||||
} // namespace ipl
|
||||
#include "math/iplMathTypes.h"
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
template <>
|
||||
class HermiteIntp<VEC3> : public utility::FrameController {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
VEC3 get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
VEC3 result =
|
||||
(mStart * (1.0f + (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))))) -
|
||||
(mEnd * (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
return result;
|
||||
}
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
} // namespace math
|
||||
} // namespace ipl
|
||||
|
||||
@@ -50,6 +50,7 @@ namespace ipl {
|
||||
void add_friendinfo();
|
||||
void delete_friendinfo();
|
||||
void set_textbox(nw4r::lyt::Pane*, const wchar_t*);
|
||||
void set_textbox(nw4r::lyt::Pane* pane, u32 msgId);
|
||||
void setDefaultTitleText(const wchar_t*, bool);
|
||||
static void wiiid_utf16(u64, wchar_t*);
|
||||
static void nigaoe_create_callback_add(ipl::nigaoe::Object*, void*);
|
||||
|
||||
@@ -159,7 +159,7 @@ namespace ipl {
|
||||
RBRRecordType mRecordType; // 0xDC
|
||||
u32 mOptOutFlag; // 0xE0
|
||||
|
||||
class {
|
||||
class StandData {
|
||||
public:
|
||||
void init() {
|
||||
mAngleIdx = -1;
|
||||
|
||||
@@ -180,6 +180,7 @@ namespace ipl {
|
||||
|
||||
BOOL is_url_end_code(wchar_t ch) const;
|
||||
BOOL is_url_protocol(const wchar_t* url) const;
|
||||
BOOL is_url_ext(const wchar_t* url) const;
|
||||
int get_url_end(const wchar_t* url) const;
|
||||
|
||||
BOOL is_buffer_over(const wchar_t* text, u32 textLen) const;
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
extern "C" BOOL push_button_queue(void*, const void*);
|
||||
class ButtonEventHandlerBase;
|
||||
class OptOutButtonEventHandlerBase;
|
||||
class SDMenuEventHandlerBase;
|
||||
@@ -315,7 +314,6 @@ namespace ipl {
|
||||
}
|
||||
|
||||
protected:
|
||||
friend BOOL push_button_queue(void*, const void*);
|
||||
typedef struct Command {
|
||||
enum {
|
||||
TYPE_ANIM = 0,
|
||||
|
||||
@@ -35,11 +35,7 @@ namespace ipl {
|
||||
MemoryBase* mpBase; // 0x0C
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) MemoryBase {
|
||||
#else
|
||||
class MemoryBase {
|
||||
#endif
|
||||
public:
|
||||
class Anm {
|
||||
public:
|
||||
@@ -52,10 +48,10 @@ namespace ipl {
|
||||
|
||||
class Button {
|
||||
public:
|
||||
Button(nw4r::lyt::Pane* pane) : unk_0x04(0), mPane(pane) {}
|
||||
Button(nw4r::lyt::Pane* pane) : mHoverCount(0), mPane(pane) {}
|
||||
virtual ~Button();
|
||||
|
||||
u32 unk_0x04; // 0x04
|
||||
u32 mHoverCount; // 0x04
|
||||
nw4r::lyt::Pane* mPane; // 0x08
|
||||
nw4r::ut::Link mLink; // 0x0C
|
||||
};
|
||||
@@ -63,8 +59,8 @@ namespace ipl {
|
||||
class AnmButton {
|
||||
public:
|
||||
AnmButton(const char* name, Anm* anm1, Anm* anm2, Anm* anm3)
|
||||
: unk_0x04(0), mName(name), mCurrentAnm(NULL), mAnm1(anm1), mAnm2(anm2), mAnm3(anm3),
|
||||
unk_0x24(0), mLastCmd(0), mpBalloon(NULL) {}
|
||||
: mHoverCount(0), mName(name), mCurrentAnm(NULL), mAnm1(anm1), mAnm2(anm2), mAnm3(anm3),
|
||||
mAnimationState(0), mLastCmd(0), mpBalloon(NULL) {}
|
||||
virtual ~AnmButton();
|
||||
|
||||
void calc();
|
||||
@@ -72,14 +68,14 @@ namespace ipl {
|
||||
|
||||
void setBalloon(TextBalloon* balloon);
|
||||
|
||||
int unk_0x04; // 0x04
|
||||
int mHoverCount; // 0x04
|
||||
const char* mName; // 0x08
|
||||
Anm* mCurrentAnm; // 0x0C
|
||||
Anm* mAnm1; // 0x10
|
||||
Anm* mAnm2; // 0x14
|
||||
Anm* mAnm3; // 0x18
|
||||
nw4r::ut::Link mLink; // 0x1C
|
||||
u32 unk_0x24; // 0x24
|
||||
u32 mAnimationState; // 0x24
|
||||
int mLastCmd; // 0x28
|
||||
TextBalloon* mpBalloon; // 0x2C
|
||||
};
|
||||
@@ -92,7 +88,7 @@ namespace ipl {
|
||||
#ifdef IPL_MEMORYCARD_BASE_CTOR_OUT_OF_LINE
|
||||
MemoryBase();
|
||||
#else
|
||||
MemoryBase() : mpLayout(NULL), unk_0x08(NULL) {
|
||||
MemoryBase() : mpLayout(NULL), mpLayoutFile(NULL) {
|
||||
nw4r::ut::List_Init(&mAnmList, offsetof(Anm, mLink));
|
||||
nw4r::ut::List_Init(&mButtonList, offsetof(Button, mLink));
|
||||
nw4r::ut::List_Init(&mAnmButtonList, offsetof(AnmButton, mLink));
|
||||
@@ -136,7 +132,7 @@ namespace ipl {
|
||||
|
||||
protected:
|
||||
layout::Object* mpLayout; // 0x04
|
||||
nand::LayoutFile* unk_0x08; // 0x08
|
||||
nand::LayoutFile* mpLayoutFile; // 0x08
|
||||
gui::PaneManager* mpPaneManager; // 0x0C
|
||||
nw4r::ut::List mAnmList; // 0x10
|
||||
nw4r::ut::List mButtonList; // 0x1C
|
||||
|
||||
@@ -72,7 +72,7 @@ namespace ipl {
|
||||
typedef struct MCFile {
|
||||
u32 fileNo; // 0x00
|
||||
u32 reserved; // 0x04
|
||||
u32 unk_0x08; // 0x08
|
||||
u32 sortKeyHigh; // 0x08
|
||||
s32 sortKey; // 0x0C
|
||||
} MCFile; // 0x10
|
||||
|
||||
@@ -99,8 +99,8 @@ namespace ipl {
|
||||
mLastCmd = 0;
|
||||
__CARDSetDiskID(NULL);
|
||||
memorycard::initCardThread();
|
||||
sort_file_array(0);
|
||||
sort_file_array(1);
|
||||
sort_file_array(CARD_CHAN_0);
|
||||
sort_file_array(CARD_CHAN_1);
|
||||
}
|
||||
virtual ~MemoryCardManager();
|
||||
|
||||
@@ -166,11 +166,11 @@ namespace ipl {
|
||||
void update_file_array(u8 slot);
|
||||
void update_change_cardstate(u8 slot);
|
||||
|
||||
GXTexObj* create_icon(u8 slot, s16 index);
|
||||
GXTexObj* create_icon(u8 slot, s16 index, long start);
|
||||
GXTexObj* _create_icon(u8 slot, s16 fileNo, long start);
|
||||
const GXTexObj* create_icon(u8 slot, s16 index);
|
||||
const GXTexObj* create_icon(u8 slot, s16 index, long start);
|
||||
const GXTexObj* _create_icon(u8 slot, s16 fileNo, long start);
|
||||
const wchar_t* getComment(u8 slot, s16 index, int which);
|
||||
GXTexObj* create_banner(u8 slot, s16 index);
|
||||
const GXTexObj* create_banner(u8 slot, s16 index);
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
u32 getBlocks(u8 slot, s16 index);
|
||||
#else
|
||||
@@ -187,14 +187,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
private:
|
||||
GXTexObj* initBannerTexture(u8 slot, s32 file, void* data) {
|
||||
GXInitTexObj(&mFileCell[slot][file].banner, data, 0x60, 0x20,
|
||||
const GXTexObj* initBannerTexture(u8 slot, s32 file, void* data) {
|
||||
GXInitTexObj(&mFileCell[slot][file].banner, data, CARD_BANNER_WIDTH, CARD_BANNER_HEIGHT,
|
||||
GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
return &mFileCell[slot][file].banner;
|
||||
}
|
||||
|
||||
void initBannerTextureCI(u8 slot, s32 file, void* data) {
|
||||
GXInitTexObjCI(&mFileCell[slot][file].banner, data, 0x60, 0x20,
|
||||
GXInitTexObjCI(&mFileCell[slot][file].banner, data, CARD_BANNER_WIDTH, CARD_BANNER_HEIGHT,
|
||||
GX_TF_C8, GX_CLAMP, GX_CLAMP, GX_FALSE, GX_TLUT0);
|
||||
}
|
||||
|
||||
@@ -203,9 +203,25 @@ namespace ipl {
|
||||
return &mFileCell[slot][file].bannerTlut;
|
||||
}
|
||||
|
||||
const GXTexObj* initIconTexture(u8 slot, s32 file, void* data) {
|
||||
GXInitTexObj(&mFileCell[slot][file].icon, data, CARD_ICON_WIDTH, CARD_ICON_HEIGHT,
|
||||
GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
return &mFileCell[slot][file].icon;
|
||||
}
|
||||
|
||||
void initIconTextureCI(u8 slot, s32 file, void* data) {
|
||||
GXInitTexObjCI(&mFileCell[slot][file].icon, data, CARD_ICON_WIDTH, CARD_ICON_HEIGHT,
|
||||
GX_TF_C8, GX_CLAMP, GX_CLAMP, GX_FALSE, GX_TLUT0);
|
||||
}
|
||||
|
||||
GXTlutObj* initIconPalette(u8 slot, s32 file, void* data) {
|
||||
GXInitTlutObj(&mFileCell[slot][file].iconTlut, data, GX_TL_RGB5A3, 0x100);
|
||||
return &mFileCell[slot][file].iconTlut;
|
||||
}
|
||||
|
||||
u32 reserved; // 0x00004
|
||||
MCFile mFile[2][0x7F]; // 0x00008
|
||||
MCFileCell mFileCell[2][0x7F]; // 0x00FE8
|
||||
MCFile mFile[2][CARD_MAX_FILE]; // 0x00008
|
||||
MCFileCell mFileCell[2][CARD_MAX_FILE]; // 0x00FE8
|
||||
s32 mLastResult; // 0x16930
|
||||
s32 mLastCmd; // 0x16934
|
||||
u32 mReservedResult; // 0x16938
|
||||
|
||||
@@ -142,14 +142,9 @@ namespace ipl {
|
||||
u32 mTransferStatus;
|
||||
u64 mTransferStartTime;
|
||||
s32 mTransferFrame;
|
||||
struct TitleListState {
|
||||
ESTitleId* mpTitles;
|
||||
u32 mCount;
|
||||
ESTitleId* mpSecondaryTitles;
|
||||
u32 mSecondaryCount;
|
||||
ESTitleId* mpNames;
|
||||
u32 mNameCount;
|
||||
} mTitleListState;
|
||||
NandSDWorker::TitleIdList mTitleList;
|
||||
NandSDWorker::TitleIdList mNandTitleList;
|
||||
NandSDWorker::TitleIdList mSDTitleList;
|
||||
scroller mScroller;
|
||||
s32 mButtonState;
|
||||
u8 mControllerFlags[4];
|
||||
|
||||
@@ -177,8 +177,8 @@ namespace ipl {
|
||||
const controller::Interface* controller);
|
||||
BOOL onEventDerived(const char* paneName, u32 event,
|
||||
controller::Interface* controller);
|
||||
bool collectTitlesByUsage(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
bool collectTitlesByUsage(s32* firstUsage, s32* secondUsage,
|
||||
ESTitleId* titleIds, wchar_t (*titleNames)[21],
|
||||
u32* titleCount);
|
||||
|
||||
static const char* mscChannelPaneNames[PAGE_COUNT][MAX_CHANNEL_INDEX];
|
||||
@@ -197,6 +197,8 @@ namespace ipl {
|
||||
friend class SDChannelSelectEventHandler;
|
||||
friend class SDChannelSelectButtonEventHandler;
|
||||
#endif
|
||||
friend class SDMemory;
|
||||
|
||||
void enqueueStartNotice();
|
||||
bool enqueueFinishNotice();
|
||||
bool enqueueNotice(u32 highTitleId, u32 lowTitleId, u32 result);
|
||||
@@ -204,11 +206,14 @@ namespace ipl {
|
||||
bool enqueuePageNotice();
|
||||
bool enqueueResultNotice(u32 result);
|
||||
bool enqueueChannelNotice(u64 titleId, u32 value);
|
||||
bool enqueueMoveNotice(u32 controller, u32 page, u32 index);
|
||||
bool enqueueMoveNotice(ESTitleId titleId);
|
||||
bool enqueueStateNotice(u64 titleId, u32 state);
|
||||
bool enqueueErrorNotice(u32 page, u32 index);
|
||||
bool enqueueCommandNotice(u32 page, u32 index, u32 command);
|
||||
bool enqueueDeleteNotice(u32 controller, u32 page, u32 index);
|
||||
bool enqueueErrorNotice(NandSDWorker::TitleIdList* newTitles,
|
||||
NandSDWorker::TitleIdList* replacingTitles);
|
||||
bool enqueueCommandNotice(NandSDWorker::TitleIdList* titles,
|
||||
NandSDWorker::TitleIdList* foundTitles,
|
||||
NandSDWorker::TitleIdList* badTitles);
|
||||
bool enqueueDeleteNotice(ESTitleId titleId);
|
||||
void clearCommandQueue();
|
||||
void clearNoticeQueue();
|
||||
void calcChannelObjects();
|
||||
@@ -221,7 +226,7 @@ namespace ipl {
|
||||
int getCenterChannelIndex(const char* paneName) const;
|
||||
nw4r::lyt::Pane* getCenterChannelPane(int index) const;
|
||||
nw4r::lyt::Pane* getChannelPane(int index) const;
|
||||
static math::VEC3 getChannelPanePosition(SDChannelSelect* scene, int index);
|
||||
static nw4r::math::VEC3 getChannelPanePosition(SDChannelSelect* scene, int index);
|
||||
void calcPageAnimations();
|
||||
void processNormalInput();
|
||||
void updateArrowVisibility();
|
||||
@@ -232,17 +237,17 @@ namespace ipl {
|
||||
void setChannelScissor(const SDChannelObj* channel) const;
|
||||
bool isCurrentTitleUsageEnough(const s32* usage) const;
|
||||
void getCurrentTitleUsage(s32* bytes, s32* blocks) const;
|
||||
bool collectTitlesByChannelOrder(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
bool collectTitlesByChannelOrder(s32* firstUsage, s32* secondUsage,
|
||||
ESTitleId* titleIds, wchar_t (*titleNames)[21],
|
||||
u32* titleCount);
|
||||
bool collectTitlesFromNandUsage(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
bool collectTitlesFromNandUsage(s32* firstUsage, s32* secondUsage,
|
||||
ESTitleId* titleIds, wchar_t (*titleNames)[21],
|
||||
u32* titleCount);
|
||||
bool collectTitlesBySpecialChannels(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
bool collectTitlesBySpecialChannels(s32* firstUsage, s32* secondUsage,
|
||||
ESTitleId* titleIds, wchar_t (*titleNames)[21],
|
||||
u32* titleCount);
|
||||
bool collectTitlesForMode(const s32* firstUsage, const s32* secondUsage,
|
||||
ESTitleId* titleIds, char* titleNames,
|
||||
bool collectTitlesForMode(s32* firstUsage, s32* secondUsage,
|
||||
ESTitleId* titleIds, wchar_t (*titleNames)[21],
|
||||
u32* titleCount, int searchMode);
|
||||
bool findAdjacentChannel(int direction, int* page, int* index) const;
|
||||
void setStateAndPlaySelectSound(int state) NO_INLINE;
|
||||
|
||||
@@ -20,6 +20,19 @@ typedef struct AOSSInitInput {
|
||||
u8 result[0x154];
|
||||
} AOSSInitInput;
|
||||
|
||||
typedef struct AOSSKeyMaterial {
|
||||
u8 nonce[2];
|
||||
u8 address[8];
|
||||
} AOSSKeyMaterial;
|
||||
|
||||
typedef struct AOSSPacketState {
|
||||
AOSSKeyMaterial key;
|
||||
u8 payload[0x5e];
|
||||
} AOSSPacketState;
|
||||
|
||||
extern AOSSPacketState s_packetState;
|
||||
extern u32 s_crcTable[0x100];
|
||||
|
||||
int AOSSi_Init(AOSSInitInput* input);
|
||||
int AOSS_Init_old(AOSSInitInput* input);
|
||||
void* AOSSi_Alloc(u32 size);
|
||||
|
||||
@@ -50,6 +50,7 @@ namespace ipl {
|
||||
static void makeMasterkey();
|
||||
|
||||
static char* getRequestNum();
|
||||
static void dump();
|
||||
|
||||
private:
|
||||
static void _initRating();
|
||||
|
||||
@@ -18,6 +18,15 @@ namespace ipl {
|
||||
f32 margin16x9 = 120.0f, f32 margin4x3 = 30.0f);
|
||||
~TextBalloon();
|
||||
|
||||
static f32 getDefaultMargin16x9() {
|
||||
f32 margin = 120.0f;
|
||||
return margin;
|
||||
}
|
||||
static f32 getDefaultMargin4x3() {
|
||||
f32 margin = 30.0f;
|
||||
return margin;
|
||||
}
|
||||
|
||||
void calc();
|
||||
void draw();
|
||||
|
||||
|
||||
@@ -277,6 +277,9 @@ namespace ipl {
|
||||
/* SEntry */
|
||||
bool hasLoadedBnr(int page, int index) const { return mChannels[page][index].loadedBnr; }
|
||||
int getSceneID(int page, int index) const { return mChannels[page][index].loadedBnr ? mChannels[page][index].info.sceneID : 0; }
|
||||
ESTitleId getEntryTitleID(int page, int index) const {
|
||||
return mChannels[page][index].loadedBnr ? ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode) : 0;
|
||||
}
|
||||
|
||||
/* SMetaBlockHeader */
|
||||
u32 getIconRSOIdx(int page, int index) const {
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace ipl {
|
||||
Manager(EGG::Heap* heap);
|
||||
|
||||
/** @return The message data in use. */
|
||||
const wchar_t* getMessage(u32 id) const { return mpMessage->getMessage(id); }
|
||||
wchar_t* getMessage(u32 id) const { return mpMessage->getMessage(id); }
|
||||
void setResource(u8* msgData) const { mpMessage->setResource(msgData); }
|
||||
|
||||
private:
|
||||
|
||||
@@ -190,6 +190,7 @@ namespace ipl {
|
||||
|
||||
PointerCore mCore; // 0x40
|
||||
|
||||
friend class System;
|
||||
friend class PointerCoreObject;
|
||||
friend class PointerCore;
|
||||
friend class utility::BScroller;
|
||||
|
||||
@@ -302,7 +302,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
/** @return The Message ID as a Wide-string. */
|
||||
static const wchar_t* getMessage(u32 id) { return smArg.mpMessageMgr->getMessage(id); }
|
||||
static wchar_t* getMessage(u32 id) { return smArg.mpMessageMgr->getMessage(id); }
|
||||
static message::Manager* getMessageManager() { return smArg.mpMessageMgr; }
|
||||
|
||||
static void* getFont();
|
||||
|
||||
@@ -47,6 +47,8 @@ namespace ipl {
|
||||
|
||||
static ESError GetValidTicketIndex(EGG::Heap* heap, ESTitleId titleId, ESTicketView* ticket = NULL, u32 ticketLength = 0);
|
||||
|
||||
static ESError DeleteSharedContent(EGG::Heap* heap);
|
||||
|
||||
static BOOL IsLastTicketExpired(ESTitleId* titleId);
|
||||
static void DeleteExpiredFlagFile();
|
||||
|
||||
|
||||
@@ -10,31 +10,9 @@ namespace ipl {
|
||||
public:
|
||||
inline Queue<T, c>() : count(c), current(0), popped(0), pushed(0) {}
|
||||
|
||||
BOOL push(const T& item) {
|
||||
if (count == current) {
|
||||
return FALSE;
|
||||
}
|
||||
items[pushed] = item;
|
||||
if (++pushed >= count) {
|
||||
pushed = 0;
|
||||
}
|
||||
current++;
|
||||
return TRUE;
|
||||
}
|
||||
BOOL push(const T& item);
|
||||
|
||||
BOOL pop() {
|
||||
BOOL result = TRUE;
|
||||
if (current == 0) {
|
||||
result = FALSE;
|
||||
goto done;
|
||||
}
|
||||
if (++popped >= count) {
|
||||
popped = 0;
|
||||
}
|
||||
current--;
|
||||
done:
|
||||
return result;
|
||||
}
|
||||
BOOL pop();
|
||||
|
||||
int get_current_index() { return current; }
|
||||
T& get_current_item() { return items[get_current_index()]; }
|
||||
@@ -55,6 +33,34 @@ namespace ipl {
|
||||
int current; // (sizeof(items) * count) + 0x04
|
||||
int popped, pushed; // (sizeof(items) * count) + 0x08
|
||||
};
|
||||
|
||||
template <typename T, int c>
|
||||
BOOL Queue<T, c>::push(const T& item) {
|
||||
if (count == current) {
|
||||
return FALSE;
|
||||
}
|
||||
items[pushed] = item;
|
||||
if (++pushed >= count) {
|
||||
pushed = 0;
|
||||
}
|
||||
current++;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
template <typename T, int c>
|
||||
BOOL Queue<T, c>::pop() {
|
||||
BOOL result = TRUE;
|
||||
if (current == 0) {
|
||||
result = FALSE;
|
||||
goto done;
|
||||
}
|
||||
if (++popped >= count) {
|
||||
popped = 0;
|
||||
}
|
||||
current--;
|
||||
done:
|
||||
return result;
|
||||
}
|
||||
} // namespace utility
|
||||
} // namespace ipl
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ namespace ipl {
|
||||
void init() {
|
||||
mState = 0;
|
||||
mScroll = 0.0f;
|
||||
unk_0x3C = 0.0f;
|
||||
mScrollVelocity = 0.0f;
|
||||
mUpLimit = 0.0f;
|
||||
mDownLimit = 0.0f;
|
||||
}
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
int mState; // 0x30
|
||||
f32 mDownLimit; // 0x34
|
||||
f32 mUpLimit; // 0x38
|
||||
f32 unk_0x3C;
|
||||
f32 mScrollVelocity;
|
||||
f32 mScroll; // 0x40
|
||||
f32 mButtonScrollOrigin;
|
||||
f32 mVelocityDecay;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <nw4r/snd.h>
|
||||
|
||||
#include <revolution/os.h>
|
||||
#pragma sym on
|
||||
|
||||
namespace EGG {
|
||||
ArcPlayer::ArcPlayer(nw4r::snd::SoundHeap* pHeap) : mpSoundHeap(pHeap) {
|
||||
mStorage = SARC_STORAGE_NONE;
|
||||
@@ -202,7 +202,7 @@ namespace EGG {
|
||||
return false;
|
||||
}
|
||||
|
||||
return mSoundArchivePlayer.LoadGroup((int)id, pHeap, 0);
|
||||
return mSoundArchivePlayer.LoadGroup(id, pHeap, 0);
|
||||
}
|
||||
|
||||
bool ArcPlayer::loadGroup(const char* pName, nw4r::snd::SoundHeap* pHeap) {
|
||||
|
||||
@@ -15,14 +15,14 @@ namespace EGG {
|
||||
AudioFxMgr::AudioFxMgrArg unused1;
|
||||
}
|
||||
|
||||
void SimpleAudioMgrWithFx::initialize(IAudioMgr::Arg* arg) {
|
||||
SimpleAudioMgr::initialize(arg);
|
||||
void SimpleAudioMgrWithFx::initialize(IAudioMgr::Arg* audioArgs) {
|
||||
SimpleAudioMgr::initialize(audioArgs);
|
||||
|
||||
if (arg != NULL) {
|
||||
arg = (IAudioMgr::Arg*)&((ArgWithFx*)arg)->fxArg;
|
||||
if (audioArgs != NULL) {
|
||||
audioArgs = (IAudioMgr::Arg*)&((ArgWithFx*)audioArgs)->fxArg;
|
||||
}
|
||||
|
||||
initializeFx(&mHeap, (AudioFxMgrArg*)arg);
|
||||
initializeFx(&mHeap, (AudioFxMgrArg*)audioArgs);
|
||||
|
||||
setFxReverbHi(nw4r::snd::AUX_A, AudioFxMgr::getDefaultFxReverbHi());
|
||||
setFxChorus(nw4r::snd::AUX_B, AudioFxMgr::getDefaultFxChorus());
|
||||
|
||||
@@ -74,8 +74,7 @@ namespace EGG {
|
||||
return MEMAllocFromFrmHeapEx(mHeapHandle, size, align);
|
||||
}
|
||||
|
||||
void FrmHeap::free(void* ptr) {
|
||||
#pragma unused(ptr)
|
||||
void FrmHeap::free(void*) {
|
||||
}
|
||||
|
||||
u32 FrmHeap::resizeForMBlock(void* ptr, u32 size) {
|
||||
|
||||
@@ -36,8 +36,6 @@ namespace EGG {
|
||||
}
|
||||
|
||||
void* Heap::alloc(u32 size, int align, Heap* heap) {
|
||||
void* ptr = NULL;
|
||||
|
||||
if (sAllocatableHeap != NULL) {
|
||||
if (sCurrentHeap != NULL && heap == NULL) {
|
||||
heap = sCurrentHeap;
|
||||
@@ -53,13 +51,7 @@ namespace EGG {
|
||||
}
|
||||
|
||||
if (sCurrentHeap != NULL) {
|
||||
ptr = sCurrentHeap->alloc(size, align);
|
||||
|
||||
if (ptr == NULL) {
|
||||
// stripped out EGG_PRINT
|
||||
}
|
||||
|
||||
return ptr;
|
||||
return sCurrentHeap->alloc(size, align);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
@@ -170,7 +162,7 @@ void* operator new[](size_t size, EGG::Heap* heap, int align) {
|
||||
|
||||
void operator delete(void* ptr) {
|
||||
EGG::Heap::free(ptr, NULL);
|
||||
// don't inline. (NO_INLINE did not want to work)
|
||||
// MWCC needs these no-op statements to keep operator delete out of Heap's destructor.
|
||||
(void)0;
|
||||
(void)0;
|
||||
(void)0;
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace EGG {
|
||||
|
||||
mpOSThread = static_cast<OSThread*>(Heap::alloc(sizeof(OSThread), 32, mpContainHeap));
|
||||
|
||||
OSCreateThread(mpOSThread, Thread::start, this, reinterpret_cast<u8*>(mpStackMemory) + mStackSize, mStackSize, priority,
|
||||
OSCreateThread(mpOSThread, Thread::start, this, static_cast<u8*>(mpStackMemory) + mStackSize, mStackSize, priority,
|
||||
OS_THREAD_ATTR_DETACH);
|
||||
|
||||
setCommonMesgQueue(capacity, mpContainHeap);
|
||||
|
||||
@@ -22,7 +22,11 @@ int strcmp(const char* s1, const char* s2);
|
||||
char* strpbrk(const char* s1, const char* s2);
|
||||
size_t strspn(const char* s1, const char* s2);
|
||||
char* strtok(char* str, const char* delimiters);
|
||||
#ifdef __cplusplus
|
||||
const char* strstr(const char* str, const char* pat);
|
||||
#else
|
||||
char* strstr(const char* str, const char* pat);
|
||||
#endif
|
||||
|
||||
char* strncpy(char* dst, const char* src, size_t length);
|
||||
char* strncat(char* dst, const char* src, size_t length);
|
||||
@@ -39,4 +43,12 @@ int strcmpi(const char* s1, const char* s2);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C++" {
|
||||
inline char* strstr(char* str, const char* pat) {
|
||||
return const_cast<char*>(strstr(static_cast<const char*>(str), pat));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // MSL_STRING_H
|
||||
|
||||
@@ -27,7 +27,11 @@ wchar_t* wcscat(wchar_t* dest, const wchar_t* src);
|
||||
wchar_t* wcsncat(wchar_t* dest, const wchar_t* src, size_t num);
|
||||
int wcsncmp(const wchar_t* s1, const wchar_t* s2, size_t num);
|
||||
wchar_t* wcschr(wchar_t* ws, wchar_t wc);
|
||||
#ifndef __cplusplus
|
||||
wchar_t* wcsstr(const wchar_t* s1, const wchar_t* s2);
|
||||
#else
|
||||
const wchar_t* wcsstr(const wchar_t* s1, const wchar_t* s2);
|
||||
#endif
|
||||
|
||||
int swprintf(wchar_t* ws, size_t len, const wchar_t* format, ...);
|
||||
int vswprintf(wchar_t* ws, size_t len, const wchar_t* format, va_list arg);
|
||||
@@ -36,6 +40,12 @@ int wcsnicmp(const char* dst, const char* src, size_t num);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
extern "C++" {
|
||||
inline wchar_t* wcsstr(wchar_t* s1, const wchar_t* s2) {
|
||||
return const_cast<wchar_t*>(wcsstr(static_cast<const wchar_t*>(s1), s2));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // MSL_WCHAR_H
|
||||
|
||||
@@ -432,8 +432,8 @@ static void* allocate_from_var_pools(__mem_pool_obj* pool, unsigned int size, un
|
||||
}
|
||||
|
||||
static void* soft_allocate_from_var_pools(__mem_pool_obj* pool, unsigned int size, unsigned int* out) {
|
||||
register Block* bp;
|
||||
register SubBlock* ptr;
|
||||
Block* bp;
|
||||
SubBlock* ptr;
|
||||
|
||||
size = (size + 15) & ~7;
|
||||
if (size < 0x50) {
|
||||
@@ -681,9 +681,9 @@ static unsigned int __pool_allocate_resize(__mem_pool_obj* pool, void* ptr, unsi
|
||||
return 0;
|
||||
}
|
||||
|
||||
void* malloc(register unsigned int size) {
|
||||
void* malloc(unsigned int size) {
|
||||
void* rv;
|
||||
register __mem_pool_obj* pool_obj;
|
||||
__mem_pool_obj* pool_obj;
|
||||
|
||||
if (size == 0) {
|
||||
goto null_return;
|
||||
@@ -712,8 +712,8 @@ void free(void* ptr) {
|
||||
}
|
||||
|
||||
void* realloc(void* ptr, unsigned int size) {
|
||||
register unsigned int rv = size;
|
||||
register __mem_pool_obj* pool;
|
||||
unsigned int rv = size;
|
||||
__mem_pool_obj* pool;
|
||||
unsigned int current_size;
|
||||
unsigned int orig_size;
|
||||
|
||||
@@ -773,8 +773,8 @@ void* realloc(void* ptr, unsigned int size) {
|
||||
}
|
||||
|
||||
void* calloc(unsigned int nmemb, unsigned int size) {
|
||||
register void* ptr;
|
||||
register unsigned int total;
|
||||
void* ptr;
|
||||
unsigned int total;
|
||||
__mem_pool_obj* pool_obj;
|
||||
|
||||
pool_obj = (__mem_pool_obj*)get_malloc_pool();
|
||||
|
||||
@@ -54,7 +54,7 @@ typedef struct {
|
||||
int precision;
|
||||
} print_format;
|
||||
|
||||
static const char* parse_format(const char* format_string, va_list* arg, print_format* format) {
|
||||
static const char* parse_format(const char* format_string, va_list* args, print_format* format) {
|
||||
print_format f;
|
||||
const char* s = format_string;
|
||||
int c;
|
||||
@@ -109,7 +109,7 @@ static const char* parse_format(const char* format_string, va_list* arg, print_f
|
||||
}
|
||||
|
||||
if (c == '*') {
|
||||
if ((f.field_width = va_arg(*arg, int)) < 0) {
|
||||
if ((f.field_width = va_arg(*args, int)) < 0) {
|
||||
f.justification_options = left_justification;
|
||||
f.field_width = -f.field_width;
|
||||
}
|
||||
@@ -132,7 +132,7 @@ static const char* parse_format(const char* format_string, va_list* arg, print_f
|
||||
f.precision_specified = 1;
|
||||
|
||||
if ((c = *++s) == '*') {
|
||||
if ((f.precision = va_arg(*arg, int)) < 0) {
|
||||
if ((f.precision = va_arg(*args, int)) < 0) {
|
||||
f.precision_specified = 0;
|
||||
}
|
||||
|
||||
@@ -960,7 +960,7 @@ static char* float2str(long double num, char* buff, print_format format) {
|
||||
}
|
||||
|
||||
int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProcArg,
|
||||
const char* format_str, va_list arg
|
||||
const char* format_str, va_list args
|
||||
|
||||
)
|
||||
{
|
||||
@@ -1000,27 +1000,27 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
}
|
||||
|
||||
format_ptr = curr_format;
|
||||
format_ptr = parse_format(format_ptr, (va_list*)arg, &format);
|
||||
format_ptr = parse_format(format_ptr, (va_list*)args, &format);
|
||||
|
||||
switch (format.conversion_char) {
|
||||
case 'd':
|
||||
case 'i':
|
||||
if (format.argument_options == long_argument) {
|
||||
long_num = va_arg(arg, signed long);
|
||||
long_num = va_arg(args, signed long);
|
||||
} else if (format.argument_options == long_long_argument) {
|
||||
long_long_num = va_arg(arg, signed long long);
|
||||
long_long_num = va_arg(args, signed long long);
|
||||
}
|
||||
else if (format.argument_options == intmax_argument) {
|
||||
long_long_num = va_arg(arg, intmax_t);
|
||||
long_long_num = va_arg(args, intmax_t);
|
||||
}
|
||||
else if (format.argument_options == size_t_argument) {
|
||||
long_num = va_arg(arg, size_t);
|
||||
long_num = va_arg(args, size_t);
|
||||
}
|
||||
else if (format.argument_options == ptrdiff_argument) {
|
||||
long_num = va_arg(arg, ptrdiff_t);
|
||||
long_num = va_arg(args, ptrdiff_t);
|
||||
}
|
||||
else {
|
||||
long_num = va_arg(arg, int);
|
||||
long_num = va_arg(args, int);
|
||||
}
|
||||
|
||||
if (format.argument_options == short_argument) {
|
||||
@@ -1052,21 +1052,21 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
case 'x':
|
||||
case 'X':
|
||||
if (format.argument_options == long_argument) {
|
||||
long_num = va_arg(arg, unsigned long);
|
||||
long_num = va_arg(args, unsigned long);
|
||||
} else if (format.argument_options == long_long_argument) {
|
||||
long_long_num = va_arg(arg, signed long long);
|
||||
long_long_num = va_arg(args, signed long long);
|
||||
}
|
||||
else if (format.argument_options == intmax_argument) {
|
||||
long_long_num = va_arg(arg, intmax_t);
|
||||
long_long_num = va_arg(args, intmax_t);
|
||||
}
|
||||
else if (format.argument_options == size_t_argument) {
|
||||
long_num = va_arg(arg, size_t);
|
||||
long_num = va_arg(args, size_t);
|
||||
}
|
||||
else if (format.argument_options == ptrdiff_argument) {
|
||||
long_num = va_arg(arg, ptrdiff_t);
|
||||
long_num = va_arg(args, ptrdiff_t);
|
||||
}
|
||||
else {
|
||||
long_num = va_arg(arg, unsigned int);
|
||||
long_num = va_arg(args, unsigned int);
|
||||
}
|
||||
|
||||
if (format.argument_options == short_argument) {
|
||||
@@ -1100,9 +1100,9 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
case 'g':
|
||||
case 'G':
|
||||
if (format.argument_options == long_double_argument) {
|
||||
long_double_num = va_arg(arg, long double);
|
||||
long_double_num = va_arg(args, long double);
|
||||
} else {
|
||||
long_double_num = va_arg(arg, double);
|
||||
long_double_num = va_arg(args, double);
|
||||
}
|
||||
|
||||
if (!(buff_ptr = float2str(long_double_num, buff + 512, *fmt_ptr))) {
|
||||
@@ -1115,9 +1115,9 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
case 'a':
|
||||
case 'A':
|
||||
if (format.argument_options == long_double_argument) {
|
||||
long_double_num = va_arg(arg, long double);
|
||||
long_double_num = va_arg(args, long double);
|
||||
} else {
|
||||
long_double_num = va_arg(arg, double);
|
||||
long_double_num = va_arg(args, double);
|
||||
}
|
||||
|
||||
if (!(buff_ptr = double2hex(long_double_num, buff + 512, *fmt_ptr))) {
|
||||
@@ -1129,7 +1129,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
|
||||
case 's':
|
||||
if (format.argument_options == wchar_argument) {
|
||||
wchar_t* wcs_ptr = va_arg(arg, wchar_t*);
|
||||
wchar_t* wcs_ptr = va_arg(args, wchar_t*);
|
||||
|
||||
if (wcs_ptr == NULL) {
|
||||
wcs_ptr = L"";
|
||||
@@ -1141,7 +1141,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
|
||||
buff_ptr = &buff[0];
|
||||
} else {
|
||||
buff_ptr = va_arg(arg, char*);
|
||||
buff_ptr = va_arg(args, char*);
|
||||
}
|
||||
|
||||
if (buff_ptr == NULL) {
|
||||
@@ -1167,7 +1167,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
break;
|
||||
|
||||
case 'n':
|
||||
buff_ptr = va_arg(arg, char*);
|
||||
buff_ptr = va_arg(args, char*);
|
||||
|
||||
switch (format.argument_options) {
|
||||
case normal_argument:
|
||||
@@ -1197,7 +1197,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
|
||||
case 'c':
|
||||
buff_ptr = buff;
|
||||
*buff_ptr = va_arg(arg, int);
|
||||
*buff_ptr = va_arg(args, int);
|
||||
num_chars = 1;
|
||||
break;
|
||||
|
||||
@@ -1294,7 +1294,7 @@ int printf(const char* format, ...) {
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, format);
|
||||
res = __pformatter(&__FileWrite, (void*)stdout, format, args);
|
||||
res = __pformatter(&__FileWrite, stdout, format, args);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
@@ -1308,18 +1308,18 @@ int fprintf(FILE* file, const char* format, ...) {
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, format);
|
||||
res = __pformatter(&__FileWrite, (void*)file, format, args);
|
||||
res = __pformatter(&__FileWrite, file, format, args);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
int vprintf(const char* format, va_list arg) {
|
||||
int vprintf(const char* format, va_list args) {
|
||||
int ret;
|
||||
|
||||
if (fwide(stdout, -1) >= 0) {
|
||||
return -1;
|
||||
}
|
||||
ret = __pformatter(&__FileWrite, (void*)stdout, format, arg);
|
||||
ret = __pformatter(&__FileWrite, stdout, format, args);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -1345,8 +1345,8 @@ int vsnprintf(char* s, size_t n, const char* fmt, va_list args) {
|
||||
return end;
|
||||
}
|
||||
|
||||
int vsprintf(char *s, const char *format, va_list arg) {
|
||||
return vsnprintf(s, 0xFFFFFFFF, format, arg);
|
||||
int vsprintf(char *s, const char *format, va_list args) {
|
||||
return vsnprintf(s, 0xFFFFFFFF, format, args);
|
||||
}
|
||||
|
||||
int snprintf(char* s, size_t n, const char* format, ...) {
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
char* p; \
|
||||
char* q; \
|
||||
size_t n = cnt; \
|
||||
unsigned long tmp; \
|
||||
unsigned long savedWord; \
|
||||
for (p = (char*)src - 1, q = (char*)dst - 1, n++; --n;) { \
|
||||
tmp = *++q; \
|
||||
savedWord = *++q; \
|
||||
*q = *++p; \
|
||||
*p = tmp; \
|
||||
*p = savedWord; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
|
||||
@@ -257,7 +257,7 @@ static const char* parse_format(const char* format_string, scan_format* format)
|
||||
return s + 1;
|
||||
}
|
||||
|
||||
int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char* format_str, va_list arg,
|
||||
int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char* format_str, va_list args,
|
||||
int is_secure) {
|
||||
int num_chars, chars_read, items_assigned, conversions;
|
||||
int base, negative, overflow;
|
||||
@@ -319,7 +319,7 @@ int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char
|
||||
format_ptr = parse_format(format_ptr, &format);
|
||||
|
||||
if (!format.suppress_assignment && format.conversion_char != '%') {
|
||||
arg_ptr = va_arg(arg, char*);
|
||||
arg_ptr = va_arg(args, char*);
|
||||
} else {
|
||||
arg_ptr = 0;
|
||||
}
|
||||
@@ -552,7 +552,7 @@ int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char
|
||||
if (arg_ptr) {
|
||||
if (is_secure) {
|
||||
elem_valid = 1;
|
||||
elem_maxsize = va_arg(arg, size_t);
|
||||
elem_maxsize = va_arg(args, size_t);
|
||||
}
|
||||
|
||||
num_chars = 0;
|
||||
@@ -648,7 +648,7 @@ int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char
|
||||
if (arg_ptr) {
|
||||
if (is_secure) {
|
||||
elem_valid = 1;
|
||||
elem_maxsize = va_arg(arg, size_t) - 1;
|
||||
elem_maxsize = va_arg(args, size_t) - 1;
|
||||
}
|
||||
|
||||
num_chars = 0;
|
||||
@@ -742,7 +742,7 @@ int __sformatter(int (*ReadProc)(void*, int, int), void* ReadProcArg, const char
|
||||
*(long*)arg_ptr = chars_read;
|
||||
break;
|
||||
case char_argument:
|
||||
*(char*)arg_ptr = chars_read;
|
||||
*arg_ptr = chars_read;
|
||||
break;
|
||||
case long_long_argument:
|
||||
*(long long*)arg_ptr = chars_read;
|
||||
@@ -797,7 +797,7 @@ int __StringRead(void* pPtr, int ch, int act) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
inline int vsscanf(const char* s, const char* format, va_list arg) {
|
||||
inline int vsscanf(const char* s, const char* format, va_list args) {
|
||||
__InStrCtrl isc;
|
||||
isc.NextChar = (char*)s;
|
||||
|
||||
@@ -806,7 +806,7 @@ inline int vsscanf(const char* s, const char* format, va_list arg) {
|
||||
}
|
||||
|
||||
isc.NullCharDetected = 0;
|
||||
return __sformatter(&__StringRead, (void*)&isc, format, arg, 0);
|
||||
return __sformatter(&__StringRead, (void*)&isc, format, args, 0);
|
||||
}
|
||||
|
||||
int sscanf(const char* s, const char* pFormat, ...) {
|
||||
|
||||
@@ -552,8 +552,6 @@ long double __strtold(int max_width, int (*ReadProc)(void*, int, int), void* Rea
|
||||
if (sig_negative && success(scan_state)) {
|
||||
result = -result;
|
||||
}
|
||||
|
||||
return result;
|
||||
} else {
|
||||
unsigned mantissa_bit, dbl_bit;
|
||||
unsigned one_bit;
|
||||
@@ -630,9 +628,8 @@ long double __strtold(int max_width, int (*ReadProc)(void*, int, int), void* Rea
|
||||
}
|
||||
|
||||
result = *(long double*)dbl_bits;
|
||||
|
||||
return result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
double strtod(const char* str, char** end) {
|
||||
|
||||
@@ -17,7 +17,7 @@ wchar_t* wmemset(wchar_t* dest, wchar_t ch, size_t num) {
|
||||
wchar_t* wmemchr(wchar_t* ptr, wchar_t ch, size_t num) {
|
||||
while (num != 0) {
|
||||
if (*ptr == ch) {
|
||||
return (wchar_t*)ptr;
|
||||
return ptr;
|
||||
}
|
||||
|
||||
ptr++;
|
||||
|
||||
@@ -55,7 +55,7 @@ typedef struct {
|
||||
|
||||
|
||||
|
||||
static const wchar_t* parse_format(const wchar_t* format_string, va_list* arg, print_format* format) {
|
||||
static const wchar_t* parse_format(const wchar_t* format_string, va_list* args, print_format* format) {
|
||||
print_format f;
|
||||
const wchar_t* s = format_string;
|
||||
wchar_t c;
|
||||
@@ -110,14 +110,14 @@ static const wchar_t* parse_format(const wchar_t* format_string, va_list* arg, p
|
||||
}
|
||||
|
||||
if (c == '*') {
|
||||
if ((f.field_width = va_arg(*arg, int)) < 0) {
|
||||
if ((f.field_width = va_arg(*args, int)) < 0) {
|
||||
f.justification_options = left_justification;
|
||||
f.field_width = -f.field_width;
|
||||
}
|
||||
|
||||
c = *++s;
|
||||
} else {
|
||||
while ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x8) != 0) {
|
||||
while ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISDIGIT_MAP) != 0) {
|
||||
f.field_width = f.field_width * 10 + (c - '0');
|
||||
c = *++s;
|
||||
}
|
||||
@@ -133,13 +133,13 @@ static const wchar_t* parse_format(const wchar_t* format_string, va_list* arg, p
|
||||
f.precision_specified = 1;
|
||||
|
||||
if ((c = *++s) == '*') {
|
||||
if ((f.precision = va_arg(*arg, int)) < 0) {
|
||||
if ((f.precision = va_arg(*args, int)) < 0) {
|
||||
f.precision_specified = 0;
|
||||
}
|
||||
|
||||
c = *++s;
|
||||
} else {
|
||||
while ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x8) != 0)
|
||||
while ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISDIGIT_MAP) != 0)
|
||||
{
|
||||
f.precision = f.precision * 10 + (c - '0');
|
||||
c = *++s;
|
||||
@@ -769,7 +769,7 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
c = format.conversion_char;
|
||||
p = buff - 5;
|
||||
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x200) != 0) {
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISUPPER_MAP) != 0) {
|
||||
wcscpy(p, L"-INF");
|
||||
} else {
|
||||
wcscpy(p, L"-inf");
|
||||
@@ -777,7 +777,7 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
} else {
|
||||
c = format.conversion_char;
|
||||
p = buff - 4;
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x200) != 0) {
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISUPPER_MAP) != 0) {
|
||||
wcscpy(p, L"INF");
|
||||
} else {
|
||||
wcscpy(p, L"inf");
|
||||
@@ -790,7 +790,7 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
if (dec.sign) {
|
||||
c = format.conversion_char;
|
||||
p = buff - 5;
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x200) != 0) {
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISUPPER_MAP) != 0) {
|
||||
wcscpy(p, L"-NAN");
|
||||
} else {
|
||||
wcscpy(p, L"-nan");
|
||||
@@ -798,7 +798,7 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
} else {
|
||||
c = format.conversion_char;
|
||||
p = buff - 4;
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & 0x200) != 0) {
|
||||
if ((c >= 0x100 ? 0 : _current_locale.ctype_cmpt_ptr->wctype_map_ptr[c] & __MSL_ISUPPER_MAP) != 0) {
|
||||
wcscpy(p, L"NAN");
|
||||
} else {
|
||||
wcscpy(p, L"nan");
|
||||
@@ -958,8 +958,8 @@ static wchar_t* float2str(double num, wchar_t* buff, print_format format) {
|
||||
break;
|
||||
}
|
||||
|
||||
p = buff - strlen((char*)p2) - 1;
|
||||
mbstowcs(p, p2, strlen((char*)p2));
|
||||
p = buff - strlen(p2) - 1;
|
||||
mbstowcs(p, p2, strlen(p2));
|
||||
|
||||
return p;
|
||||
}
|
||||
@@ -1290,7 +1290,7 @@ void* __wStringWrite(void* wosc, const wchar_t* buffer, size_t numchars) {
|
||||
void* res;
|
||||
__wOutStrCtrl* wOscp = (__wOutStrCtrl*)wosc;
|
||||
tobewritten = ((wOscp->CharsWritten + numchars) <= wOscp->MaxCharCount) ? numchars : wOscp->MaxCharCount - wOscp->CharsWritten;
|
||||
res = (void*)wmemcpy(wOscp->wCharStr + wOscp->CharsWritten, buffer, tobewritten);
|
||||
res = wmemcpy(wOscp->wCharStr + wOscp->CharsWritten, buffer, tobewritten);
|
||||
wOscp->CharsWritten += tobewritten;
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#include <math.h>
|
||||
|
||||
double nan(const char* arg) {}
|
||||
double nan(const char* tag) {}
|
||||
|
||||
@@ -37,14 +37,14 @@ inline DSIOResult __access_file(unsigned int handle, unsigned char* buffer, int*
|
||||
}
|
||||
|
||||
DSIOResult __read_console(unsigned int handle, unsigned char* buffer, int* count, void* ref_con) {
|
||||
if (GetUseSerialIO() == FALSE) {
|
||||
if (!GetUseSerialIO()) {
|
||||
return DS_IOError;
|
||||
}
|
||||
return __read_file(DS_Stdin, buffer, count, ref_con);
|
||||
}
|
||||
|
||||
DSIOResult __TRK_write_console(unsigned int handle, unsigned char* buffer, int* count, void* ref_con) {
|
||||
if (GetUseSerialIO() == 0) {
|
||||
if (!GetUseSerialIO()) {
|
||||
return DS_IOError;
|
||||
}
|
||||
return __write_file(DS_Stdout, buffer, count, ref_con);
|
||||
|
||||
@@ -123,7 +123,7 @@ namespace nw4r {
|
||||
const math::MTX34& GetMtx() const { return mMtx; }
|
||||
void SetMtx(const math::MTX34& mtx) { mMtx = mtx; }
|
||||
|
||||
u8 GetAlpha() { return mAlpha; }
|
||||
u8 GetAlpha() const { return mAlpha; }
|
||||
void SetAlpha(u8 alpha) { mAlpha = alpha; }
|
||||
|
||||
const char* GetName() const { return mName; }
|
||||
|
||||
@@ -55,16 +55,14 @@ namespace nw4r {
|
||||
NW4R_ASSERT(type < TEXTCOLOR_MAX);
|
||||
return mTextColors[type];
|
||||
}
|
||||
#ifdef IPL_SDMEMORY_SET_TEXT_COLORS
|
||||
void SetTextColors(const ut::Color& first, const ut::Color& second) {
|
||||
mTextColors[0] = first;
|
||||
mTextColors[1] = second;
|
||||
}
|
||||
#endif
|
||||
void SetTextColor(u32 type, ut::Color value) {
|
||||
NW4R_ASSERT(type < TEXTCOLOR_MAX);
|
||||
mTextColors[type] = value;
|
||||
}
|
||||
void SetTextColor(ut::Color top, ut::Color bottom) {
|
||||
mTextColors[0] = top;
|
||||
mTextColors[1] = bottom;
|
||||
}
|
||||
|
||||
void SetTextPositionH(u8 pos) { detail::SetHorizontalPosition(&mTextPosition, pos); }
|
||||
void SetTextPositionV(u8 pos) { detail::SetVerticalPosition(&mTextPosition, pos); }
|
||||
|
||||
@@ -18,29 +18,29 @@ namespace nw4r {
|
||||
inline u32 CalcOffsetSheetData(u16 countNames) {
|
||||
return ROUNDUP(CalcOffsetNameOffsetData() + countNames * sizeof(u16), 4);
|
||||
}
|
||||
inline u32 CalcOffset0AData(u16 countNames, u16 countSheets) {
|
||||
inline u32 CalcOffsetCWDHData(u16 countNames, u16 countSheets) {
|
||||
return ROUNDUP(CalcOffsetSheetData(countNames) + countSheets * sizeof(u32), 4);
|
||||
}
|
||||
inline u32 CalcOffset0CData(u16 countNames, u16 countSheets, u16 count0A) {
|
||||
return ROUNDUP(CalcOffset0AData(countNames, countSheets) + count0A * sizeof(u32), 4);
|
||||
inline u32 CalcOffsetCMAPData(u16 countNames, u16 countSheets, u16 countCWDH) {
|
||||
return ROUNDUP(CalcOffsetCWDHData(countNames, countSheets) + countCWDH * sizeof(u32), 4);
|
||||
}
|
||||
|
||||
inline u32 CalcSizeFlagSet(u32 entries) {
|
||||
return ((s32)entries + 0x1f) / 32 * 4;
|
||||
}
|
||||
|
||||
inline u32 CalcOffsetSheetFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) {
|
||||
return ROUNDUP(CalcOffset0CData(countNames, countSheets, count0A) + count0C * sizeof(u32), 4);
|
||||
inline u32 CalcOffsetSheetFlags(u16 countNames, u16 countSheets, u16 countCWDH, u16 countCMAP) {
|
||||
return ROUNDUP(CalcOffsetCMAPData(countNames, countSheets, countCWDH) + countCMAP * sizeof(u32), 4);
|
||||
}
|
||||
inline u32 CalcOffset0AFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) {
|
||||
u32 offsetSheetFlags = CalcOffsetSheetFlags(countNames, countSheets, count0A, count0C);
|
||||
inline u32 CalcOffsetCWDHFlags(u16 countNames, u16 countSheets, u16 countCWDH, u16 countCMAP) {
|
||||
u32 offsetSheetFlags = CalcOffsetSheetFlags(countNames, countSheets, countCWDH, countCMAP);
|
||||
u32 stepSheet = CalcSizeFlagSet(countSheets);
|
||||
return ROUNDUP(offsetSheetFlags + stepSheet * countNames, 4);
|
||||
}
|
||||
inline u32 CalcOffset0CFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) {
|
||||
u32 offset0AFlags = CalcOffset0AFlags(countNames, countSheets, count0A, count0C);
|
||||
u32 step0A = CalcSizeFlagSet(count0A);
|
||||
return ROUNDUP(offset0AFlags + step0A * countNames, 4);
|
||||
inline u32 CalcOffsetCMAPFlags(u16 countNames, u16 countSheets, u16 countCWDH, u16 countCMAP) {
|
||||
u32 offsetCWDHFlags = CalcOffsetCWDHFlags(countNames, countSheets, countCWDH, countCMAP);
|
||||
u32 stepCWDH = CalcSizeFlagSet(countCWDH);
|
||||
return ROUNDUP(offsetCWDHFlags + stepCWDH * countNames, 4);
|
||||
}
|
||||
|
||||
inline u32 CalcSizeSheetOffsets(u32 countSheets) {
|
||||
|
||||
@@ -92,8 +92,8 @@ namespace nw4r {
|
||||
u16 sheetGlyphCount; // 0x04
|
||||
u16 nameCount; // 0x06
|
||||
u16 sheetCount; // 0x08
|
||||
u16 smthCount_0x0a; // 0x0A
|
||||
u16 smthCount_0x0c; // 0x0C
|
||||
u16 cwdhCount; // 0x0A
|
||||
u16 cmapCount; // 0x0C
|
||||
u16 nameOffsets[0];
|
||||
} GlyphGroups;
|
||||
|
||||
|
||||
@@ -207,56 +207,50 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
static void DoDrawConsole_(ConsoleHandle console, ut::TextWriter* writer) {
|
||||
{
|
||||
s32 viewOffset;
|
||||
u16 line;
|
||||
u16 printLines;
|
||||
s32 viewOffset;
|
||||
u16 line;
|
||||
u16 printLines;
|
||||
|
||||
viewOffset = console->viewTopLine - console->ringTopLineCnt;
|
||||
printLines = 0;
|
||||
viewOffset = console->viewTopLine - console->ringTopLineCnt;
|
||||
printLines = 0;
|
||||
|
||||
if (viewOffset < 0) {
|
||||
viewOffset = 0;
|
||||
} else if (viewOffset > GetActiveLines_(console)) {
|
||||
goto end;
|
||||
}
|
||||
|
||||
line = static_cast<u16>(console->ringTop + viewOffset);
|
||||
|
||||
if (line >= console->height) {
|
||||
line -= console->height;
|
||||
}
|
||||
|
||||
while (true) {
|
||||
if (line == console->printTop && !console->printTopUsed) {
|
||||
goto end;
|
||||
}
|
||||
|
||||
DoDrawString_(console, printLines, GetTextPtr_(console, line, 0), writer);
|
||||
printLines++;
|
||||
|
||||
if (line == console->printTop) {
|
||||
goto end;
|
||||
}
|
||||
|
||||
line++;
|
||||
|
||||
if (line == console->height) {
|
||||
if (console->attr & (1 << 1)) {
|
||||
goto end;
|
||||
}
|
||||
line = 0;
|
||||
}
|
||||
|
||||
if (printLines >= console->viewLines) {
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
if (viewOffset < 0) {
|
||||
viewOffset = 0;
|
||||
} else if (viewOffset > GetActiveLines_(console)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// maybe not, with this end label?
|
||||
end:
|
||||
return;
|
||||
line = static_cast<u16>(console->ringTop + viewOffset);
|
||||
|
||||
if (line >= console->height) {
|
||||
line -= console->height;
|
||||
}
|
||||
|
||||
while (true) {
|
||||
if (line == console->printTop && !console->printTopUsed) {
|
||||
break;
|
||||
}
|
||||
|
||||
DoDrawString_(console, printLines, GetTextPtr_(console, line, 0), writer);
|
||||
printLines++;
|
||||
|
||||
if (line == console->printTop) {
|
||||
break;
|
||||
}
|
||||
|
||||
line++;
|
||||
|
||||
if (line == console->height) {
|
||||
if (console->attr & (1 << 1)) {
|
||||
break;
|
||||
}
|
||||
line = 0;
|
||||
}
|
||||
|
||||
if (printLines >= console->viewLines) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Console_DrawDirect(ConsoleHandle console) {
|
||||
|
||||
@@ -79,7 +79,7 @@ namespace nw4r {
|
||||
sException.frameMemory = NULL;
|
||||
sException.exceptionRenderObj = NULL;
|
||||
|
||||
OSCreateThread(&sException.thread, RunThread_, NULL, sThreadBuffer + 0x4000, 0x4000, 0, 1);
|
||||
OSCreateThread(&sException.thread, RunThread_, NULL, sThreadBuffer + 0x4000, 0x4000, 0, OS_THREAD_ATTR_DETACH);
|
||||
OSInitMessageQueue(&sException.queue, sMessageBuffer, 1);
|
||||
OSResumeThread(&sException.thread);
|
||||
|
||||
@@ -98,7 +98,7 @@ namespace nw4r {
|
||||
sException.FPCSR_COPY = context->fpscr;
|
||||
OSFillFPUContext(context);
|
||||
OSSetErrorHandler(error, NULL);
|
||||
if (error == 0xf) {
|
||||
if (error == OS_EXCEPTION_MEMORY_PROTECTION) {
|
||||
OSProtectRange(0, 0, 0, 3);
|
||||
OSProtectRange(1, 0, 0, 3);
|
||||
OSProtectRange(2, 0, 0, 3);
|
||||
@@ -111,7 +111,7 @@ namespace nw4r {
|
||||
param.dsisr = dsisr;
|
||||
param.dar = dar;
|
||||
|
||||
OSSendMessage(&sException.queue, ¶m, 1);
|
||||
OSSendMessage(&sException.queue, ¶m, OS_MESSAGE_BLOCK);
|
||||
|
||||
OSEnableScheduler();
|
||||
OSYieldThread();
|
||||
@@ -138,7 +138,7 @@ namespace nw4r {
|
||||
|
||||
u32 msr = PPCMfmsr();
|
||||
PPCMtmsr(msr & ~(MSR_FE0 | MSR_FE1));
|
||||
OSReceiveMessage(&sException.queue, &message, 1);
|
||||
OSReceiveMessage(&sException.queue, &message, OS_MESSAGE_BLOCK);
|
||||
OSDisableInterrupts();
|
||||
|
||||
VISetPreRetraceCallback(NULL);
|
||||
@@ -303,46 +303,46 @@ namespace nw4r {
|
||||
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
||||
u32 fpcsr = sException.FPCSR_COPY;
|
||||
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((fpcsr & 0x20000000) != 0) {
|
||||
if ((fpcsr & FPSCR_VX) != 0) {
|
||||
Exception_Printf_(" FPE: Invalid operation\n");
|
||||
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXSNAN) != 0) {
|
||||
Exception_Printf_(" SNaN\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & 0x800000) != 0) {
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXISI) != 0) {
|
||||
Exception_Printf_(" Infinity - Infinity\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & 0x400000) != 0) {
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXIDI) != 0) {
|
||||
Exception_Printf_(" Infinity / Infinity\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & 0x200000) != 0) {
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXZDZ) != 0) {
|
||||
Exception_Printf_(" 0 / 0\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & 0x100000) != 0) {
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXIMZ) != 0) {
|
||||
Exception_Printf_(" Infinity * 0\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & 0x80000) != 0) {
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXVC) != 0) {
|
||||
Exception_Printf_(" Invalid compare\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & 0x400) != 0) {
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXSOFT) != 0) {
|
||||
Exception_Printf_(" Software request\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & 0x200) != 0) {
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXSQRT) != 0) {
|
||||
Exception_Printf_(" Invalid square root\n");
|
||||
}
|
||||
if ((sException.FPCSR_COPY & 0x100) != 0) {
|
||||
if ((sException.FPCSR_COPY & FPSCR_VXCVI) != 0) {
|
||||
Exception_Printf_(" Invalid integer convert\n");
|
||||
}
|
||||
}
|
||||
if ((fpcsr & 0x10000000) != 0) {
|
||||
if ((fpcsr & FPSCR_OX) != 0) {
|
||||
Exception_Printf_(" FPE: Overflow\n");
|
||||
}
|
||||
if ((fpcsr & 0x8000000) != 0) {
|
||||
if ((fpcsr & FPSCR_UX) != 0) {
|
||||
Exception_Printf_(" FPE: Underflow\n");
|
||||
}
|
||||
if ((fpcsr & 0x4000000) != 0) {
|
||||
if ((fpcsr & FPSCR_ZX) != 0) {
|
||||
Exception_Printf_(" FPE: Zero division\n");
|
||||
}
|
||||
if ((fpcsr & 0x2000000) != 0) {
|
||||
if ((fpcsr & FPSCR_XX) != 0) {
|
||||
Exception_Printf_(" FPE: Inexact result\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,12 +135,12 @@ namespace nw4r {
|
||||
for (int i = 0; i < texCoordNum; i++) {
|
||||
GXSetVtxDesc(static_cast<GXAttr>(GX_VA_TEX0 + i), GX_DIRECT);
|
||||
}
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_F32, 0);
|
||||
if (bModulate) {
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
|
||||
}
|
||||
for (int i = 0; i < texCoordNum; i++) {
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, static_cast<GXAttr>(GX_VA_TEX0 + i), GX_CLR_RGBA, GX_F32, 0);
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, static_cast<GXAttr>(GX_VA_TEX0 + i), GX_TEX_ST, GX_F32, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -968,8 +968,8 @@ namespace nw4r {
|
||||
for (u8 id = 0; id < tevStageNum; id++) {
|
||||
GXTevStageID tevStage = static_cast<GXTevStageID>(id);
|
||||
|
||||
GXSetTevColorOp(tevStage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(tevStage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevColorOp(tevStage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(tevStage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
|
||||
GXSetTevDirect(tevStage);
|
||||
GXSetTevSwapMode(tevStage, GX_TEV_SWAP0, GX_TEV_SWAP0);
|
||||
|
||||
@@ -411,8 +411,8 @@ namespace nw4r {
|
||||
mtxPtr = mGlbMtx;
|
||||
}
|
||||
|
||||
GXLoadPosMtxImm(mtxPtr, 0);
|
||||
GXSetCurrentMtx(0);
|
||||
GXLoadPosMtxImm(mtxPtr, GX_PNMTX0);
|
||||
GXSetCurrentMtx(GX_PNMTX0);
|
||||
}
|
||||
|
||||
math::VEC2 Pane::GetVtxPos() const {
|
||||
|
||||
@@ -108,7 +108,7 @@ namespace {
|
||||
} else if (operation == ut::OPERATION_CHAR_SPACE) {
|
||||
bCharSpace = true;
|
||||
} else if (operation == ut::OPERATION_NEXT_LINE) {
|
||||
goto end_draw;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (bCharSpace) {
|
||||
@@ -128,12 +128,11 @@ namespace {
|
||||
|
||||
if (pRect->GetWidth() > maxWidth) {
|
||||
*pbOver = true;
|
||||
goto end_draw;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
end_draw:
|
||||
if (*pbOver && prStrPos) {
|
||||
*pRect = prMaxRect;
|
||||
return prStrPos - str;
|
||||
@@ -223,7 +222,7 @@ namespace nw4r {
|
||||
} else if (void* fontRes = resBlockSet.pResAccessor->GetResource('font', fontName, NULL)) {
|
||||
if (void* pMemFont = Layout::AllocMemory(sizeof(ut::ResFont))) {
|
||||
ut::ResFont* pResFont = new (pMemFont) ut::ResFont();
|
||||
bool bSuccess = pResFont->SetResource(fontRes);
|
||||
pResFont->SetResource(fontRes);
|
||||
|
||||
mpFont = pResFont;
|
||||
mTextBoxFlag.allocFont = true;
|
||||
|
||||
@@ -1,31 +1,4 @@
|
||||
#include <nw4r/db/assert.h>
|
||||
|
||||
extern "C" const u8 scLytFatalColorR;
|
||||
extern "C" const u8 scLytFatalColorG;
|
||||
extern "C" const u8 scLytFatalColorB;
|
||||
extern "C" const u8 scLytFatalColorA;
|
||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
#define NW4R_GLOBAL_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {255, 255, 255, 0}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
#include <nw4r/lyt/window.h>
|
||||
|
||||
#include <nw4r/lyt/common.h>
|
||||
@@ -38,6 +11,33 @@ extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system
|
||||
|
||||
#include <new>
|
||||
|
||||
extern "C" const u8 scLytFatalColorR;
|
||||
extern "C" const u8 scLytFatalColorG;
|
||||
extern "C" const u8 scLytFatalColorB;
|
||||
extern "C" const u8 scLytFatalColorA;
|
||||
extern "C" char scLytFatalMsg[];
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
// MWCC needs byte loads from the named color constants instead of folding their values.
|
||||
#define NW4R_GLOBAL_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal(front, back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {255, 255, 255, 0}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal(front, back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
namespace nw4r {
|
||||
namespace lyt {
|
||||
NW4R_UT_GET_DERIVED_RUNTIME_TYPEINFO(Window, Pane);
|
||||
@@ -174,8 +174,22 @@ namespace {
|
||||
flipInfo.coords[VERTEXCOLOR_RB][iy] +
|
||||
polSize.height / ((flipInfo.coords[VERTEXCOLOR_RT][iy] - flipInfo.coords[VERTEXCOLOR_RB][iy]) * tSz[iy]);
|
||||
}
|
||||
|
||||
inline void SetFrameTexOrigin(math::VEC2* texCds, int corner, int ix, int iy, u8 originX, u8 originY) {
|
||||
texCds[corner][ix] = texCds[corner ^ 2][ix] = originX;
|
||||
texCds[corner][iy] = texCds[corner ^ 1][iy] = originY;
|
||||
}
|
||||
|
||||
inline void SetFrameTexExtent(math::VEC2* texCds, const Size& polSize, const Size& texSize, const TextureFlipInfo& flipInfo, int corner, int ix,
|
||||
int iy, u8 originX, u8 originY) {
|
||||
const math::VEC2 tSz(texSize.width, texSize.height);
|
||||
texCds[corner ^ 3][ix] = texCds[corner ^ 1][ix] = originX + polSize.width / ((flipInfo.coords[corner ^ 1][ix] - originX) * tSz[ix]);
|
||||
texCds[corner ^ 3][iy] = texCds[corner ^ 2][iy] = originY + polSize.height / ((flipInfo.coords[corner ^ 2][iy] - originY) * tSz[iy]);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
namespace nw4r {
|
||||
namespace lyt {
|
||||
Window::Window(const res::Window* pBlock, const ResBlockSet& resBlockSet) : Pane(pBlock) {
|
||||
@@ -388,7 +402,17 @@ namespace nw4r {
|
||||
detail::DrawQuad(polPt, polSize, GX_TEXMAP1, texCds, bUseVtxCol ? vtxColors : NULL, alpha); \
|
||||
}
|
||||
|
||||
DRAW_QUAD_FOR_FRAME_1(LT, TEXTUREFLIP_NONE);
|
||||
GetLTFrameSize(&polPt, &polSize, basePt, mSize, frameSize);
|
||||
{
|
||||
TextureFlipInfo& flipInfo = GetTexutreFlipInfo(TEXTUREFLIP_NONE);
|
||||
int iy = flipInfo.idx[FLIPINDEX_Y];
|
||||
int ix = flipInfo.idx[FLIPINDEX_X];
|
||||
const u8 originX = flipInfo.coords[VERTEXCOLOR_LT][ix];
|
||||
const u8 originY = flipInfo.coords[VERTEXCOLOR_LT][iy];
|
||||
SetFrameTexOrigin(*texCds, VERTEXCOLOR_LT, ix, iy, originX, originY);
|
||||
SetFrameTexExtent(*texCds, polSize, texSize, flipInfo, VERTEXCOLOR_LT, ix, iy, originX, originY);
|
||||
}
|
||||
detail::DrawQuad(polPt, polSize, GX_TEXMAP1, texCds, bUseVtxCol ? vtxColors : NULL, alpha);
|
||||
DRAW_QUAD_FOR_FRAME_1(RT, TEXTUREFLIP_H);
|
||||
DRAW_QUAD_FOR_FRAME_1(RB, TEXTUREFLIP_180);
|
||||
DRAW_QUAD_FOR_FRAME_1(LB, TEXTUREFLIP_V);
|
||||
|
||||
@@ -36,8 +36,9 @@ namespace nw4r {
|
||||
return instance;
|
||||
}
|
||||
|
||||
// MWCC needs IRO 0 to recompute voice addresses inside the initialization loop.
|
||||
#pragma push
|
||||
#pragma ppc_iro_level 0 // uh
|
||||
#pragma ppc_iro_level 0
|
||||
void AxManager::Init() {
|
||||
if (mInitialized) {
|
||||
return;
|
||||
|
||||
@@ -808,7 +808,7 @@ namespace nw4r {
|
||||
} else {
|
||||
u16 a0, b0;
|
||||
|
||||
if (mVpb[0][0]->pb.lpf.on == TRUE) {
|
||||
if (mVpb[0][0]->pb.lpf.on == AX_PB_LPF_ON) {
|
||||
AXGetLpfCoefs(freq, &a0, &b0);
|
||||
|
||||
for (int j = 0; j < mChannelCount; j++) {
|
||||
@@ -817,7 +817,7 @@ namespace nw4r {
|
||||
} else {
|
||||
AXPBLPF lpf;
|
||||
|
||||
lpf.on = TRUE;
|
||||
lpf.on = AX_PB_LPF_ON;
|
||||
lpf.yn1 = 0;
|
||||
|
||||
AXGetLpfCoefs(freq, &lpf.a0, &lpf.b0);
|
||||
|
||||
@@ -148,7 +148,7 @@ namespace nw4r {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pSub = reinterpret_cast<const BankFile::DataRegion*>(pIndexTable->ref + (splitKey - pIndexTable->min));
|
||||
pSub = pIndexTable->ref + (splitKey - pIndexTable->min);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,9 +61,9 @@ namespace nw4r {
|
||||
|
||||
if (mPlayFlag) {
|
||||
if (playFlag) {
|
||||
wencMode = 1;
|
||||
wencMode = WENC_FLAG_USER_INFO;
|
||||
} else {
|
||||
wencMode = 1;
|
||||
wencMode = WENC_FLAG_USER_INFO;
|
||||
lastFlag = true;
|
||||
}
|
||||
} else {
|
||||
@@ -71,7 +71,7 @@ namespace nw4r {
|
||||
if (mFirstEncodeFlag) {
|
||||
wencMode = 0;
|
||||
} else {
|
||||
wencMode = 1;
|
||||
wencMode = WENC_FLAG_USER_INFO;
|
||||
}
|
||||
|
||||
mFirstEncodeFlag = false;
|
||||
|
||||
@@ -58,7 +58,7 @@ namespace nw4r {
|
||||
OSMessage message;
|
||||
|
||||
while (true) {
|
||||
OSReceiveMessage(&mMsgQueue, &message, 1);
|
||||
OSReceiveMessage(&mMsgQueue, &message, OS_MESSAGE_BLOCK);
|
||||
|
||||
if (reinterpret_cast<u32>(message) == MSG_AX_CALLBACK) {
|
||||
ut::AutoMutexLock autoMutex(mMutex);
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace nw4r {
|
||||
|
||||
u8 mask = 1 << 0;
|
||||
|
||||
for (int j = 0; j < 8; j++, mask <<= 1) {
|
||||
for (int j = 0; j < BITS_PER_BYTE; j++, mask <<= 1) {
|
||||
// Block represented by this bit is in use
|
||||
if (flag & mask) {
|
||||
continue;
|
||||
|
||||
@@ -718,7 +718,7 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
void StrmPlayer::NotifyStrmHeaderAsyncEndCallback(bool result, const StrmHeader* header, void* userData) {
|
||||
StrmPlayer* player = reinterpret_cast<StrmPlayer*>(userData);
|
||||
StrmPlayer* player = static_cast<StrmPlayer*>(userData);
|
||||
if (result) {
|
||||
player->Setup(header);
|
||||
} else {
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace nw4r {
|
||||
|
||||
void* TaskThread::ThreadFunc(void* arg) {
|
||||
TaskThread* thread = static_cast<TaskThread*>(arg);
|
||||
OSInitMessageQueue(&thread->mMsgQueue, thread->mMsgBuffer, 8);
|
||||
OSInitMessageQueue(&thread->mMsgQueue, thread->mMsgBuffer, MSG_QUEUE_CAPACITY);
|
||||
|
||||
thread->ThreadProc();
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace nw4r {
|
||||
OSMessage msg;
|
||||
|
||||
while (true) {
|
||||
OSReceiveMessage(&mMsgQueue, &msg, 1);
|
||||
OSReceiveMessage(&mMsgQueue, &msg, OS_MESSAGE_BLOCK);
|
||||
|
||||
if (reinterpret_cast<u32>(msg) == MSG_EXECUTE) {
|
||||
TaskManager::GetInstance().Execute();
|
||||
|
||||
@@ -160,7 +160,7 @@ namespace nw4r {
|
||||
void WavePlayer::Pause(bool flag) {
|
||||
ut::AutoInterruptLock lock;
|
||||
|
||||
if (mStartFlag == false) {
|
||||
if (!mStartFlag) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -224,7 +224,7 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
void WavePlayer::VoiceCallbackFunc(detail::AxVoice* voice, detail::AxVoice::CallbackStatus status, void* arg) {
|
||||
WavePlayer* wavePlayer = reinterpret_cast<WavePlayer*>(arg);
|
||||
WavePlayer* wavePlayer = static_cast<WavePlayer*>(arg);
|
||||
switch (status) {
|
||||
case detail::AxVoice::CALLBACK_STATUS_FINISH_WAVE:
|
||||
case detail::AxVoice::CALLBACK_STATUS_INVALIDATE_WAVE: {
|
||||
|
||||
@@ -250,7 +250,7 @@ namespace nw4r {
|
||||
}
|
||||
if (!mPauseFlag && !mSkipFlag) {
|
||||
if (mHomeButtonMenuFlag || !AxManager::GetInstance().IsHomeButtonMenu()) {
|
||||
if (ParseNextTick(true) != 0) {
|
||||
if (ParseNextTick(true)) {
|
||||
FinishPlayer();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
void WsdTrack::Start(const void* wsdData, int index) {
|
||||
mWsdData = (void*)wsdData;
|
||||
mWsdData = wsdData;
|
||||
mIndex = index;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,25 +20,24 @@ namespace nw4r {
|
||||
const HeaderedGlyphGroups* pGlgr;
|
||||
const ArchiveFontBinaryLayout* font;
|
||||
|
||||
u16 countName, countSheet, count0A, count0C;
|
||||
u16 countName, countSheet, countCWDH, countCMAP;
|
||||
|
||||
u32 stepSheets, step0A, step0C;
|
||||
u32 stepSheets, stepCWDH, stepCMAP;
|
||||
|
||||
u32 dataSheetsOff, data0AOff, data0COff;
|
||||
const u32* dataSheets;
|
||||
const u32* data0A;
|
||||
const u32* data0C;
|
||||
u32 dataSheetsOff, dataCWDHOff, dataCMAPOff;
|
||||
const u32* dataCWDH;
|
||||
const u32* dataCMAP;
|
||||
|
||||
u32 flagsSheetsOff, flags0AOff, flags0COff;
|
||||
u32 flagsSheetsOff, flagsCWDHOff, flagsCMAPOff;
|
||||
const u32* flagsSheets;
|
||||
const u32* flags0A;
|
||||
const u32* flags0C;
|
||||
const u32* flagsCWDH;
|
||||
const u32* flagsCMAP;
|
||||
|
||||
int i;
|
||||
int entryI;
|
||||
const HeaderedGlyphGroups* offsetPGlgr;
|
||||
const HeaderedGlyphGroups* groupHeaderCursor;
|
||||
const u8* offsetFlags;
|
||||
u32 loadedSheetCount, loadedSmth0ASize, loadedSmth0CSize;
|
||||
u32 loadedSheetCount, loadedCWDHSize, loadedCMAPSize;
|
||||
u32 flagWord;
|
||||
const char* groupName;
|
||||
const u32* offsetData;
|
||||
@@ -49,11 +48,10 @@ namespace nw4r {
|
||||
u32 neededCharacterSize;
|
||||
u32 baseSize;
|
||||
|
||||
u32 count0CWork;
|
||||
// MWCC needs this widened CMAP count for the original temporary allocation.
|
||||
u32 cmapCountForLayout;
|
||||
|
||||
u32& neededCharacterSizeRef = neededCharacterSize;
|
||||
|
||||
u32 loadedSizeRef;
|
||||
u32 loadedCharacterSize;
|
||||
|
||||
u32 groupOffset;
|
||||
|
||||
@@ -61,107 +59,98 @@ namespace nw4r {
|
||||
return 0;
|
||||
}
|
||||
|
||||
font = (ArchiveFontBinaryLayout*)fontData;
|
||||
font = static_cast<const ArchiveFontBinaryLayout*>(fontData);
|
||||
pGlgr = &font->glgr;
|
||||
|
||||
countName = pGlgr->inner.nameCount;
|
||||
countSheet = pGlgr->inner.sheetCount;
|
||||
count0A = pGlgr->inner.smthCount_0x0a;
|
||||
count0C = pGlgr->inner.smthCount_0x0c;
|
||||
count0CWork = count0C;
|
||||
countCWDH = pGlgr->inner.cwdhCount;
|
||||
countCMAP = pGlgr->inner.cmapCount;
|
||||
cmapCountForLayout = countCMAP;
|
||||
|
||||
stepSheets = ((s32)countSheet + 0x1f) / 32 * 4;
|
||||
step0A = ((s32)count0A + 0x1f) / 32 * 4;
|
||||
step0C = ((s32)count0CWork + 0x1f) / 32 * 4;
|
||||
stepCWDH = ((s32)countCWDH + 0x1f) / 32 * 4;
|
||||
stepCMAP = ((s32)cmapCountForLayout + 0x1f) / 32 * 4;
|
||||
|
||||
dataSheetsOff = ROUNDUP(offsetof(ArchiveFontBinaryLayout, glgr.inner.nameOffsets) + countName * sizeof(u16), 4);
|
||||
data0AOff = ROUNDUP(dataSheetsOff + countSheet * sizeof(u32), 4);
|
||||
data0COff = ROUNDUP(data0AOff + count0A * sizeof(u32), 4);
|
||||
dataSheets = (const u32*)((u32)dataSheetsOff + (u32)fontData);
|
||||
data0A = (const u32*)((u32)data0AOff + (u32)fontData);
|
||||
data0C = (const u32*)((u32)data0COff + (u32)fontData);
|
||||
dataCWDHOff = ROUNDUP(dataSheetsOff + countSheet * sizeof(u32), 4);
|
||||
dataCMAPOff = ROUNDUP(dataCWDHOff + countCWDH * sizeof(u32), 4);
|
||||
dataCWDH = (const u32*)(dataCWDHOff + (u32)fontData);
|
||||
dataCMAP = (const u32*)(dataCMAPOff + (u32)fontData);
|
||||
|
||||
flagsSheetsOff = ROUNDUP(data0COff + count0CWork * sizeof(u32), 4);
|
||||
flags0AOff = ROUNDUP(flagsSheetsOff + stepSheets * countName, 4);
|
||||
flags0COff = ROUNDUP(flags0AOff + step0A * countName, 4);
|
||||
flagsSheetsOff = ROUNDUP(dataCMAPOff + cmapCountForLayout * sizeof(u32), 4);
|
||||
flagsCWDHOff = ROUNDUP(flagsSheetsOff + stepSheets * countName, 4);
|
||||
flagsCMAPOff = ROUNDUP(flagsCWDHOff + stepCWDH * countName, 4);
|
||||
|
||||
flagsSheets = (const u32*)((u32)flagsSheetsOff + (u32)fontData);
|
||||
flags0A = (const u32*)((u32)flags0AOff + (u32)fontData);
|
||||
flags0C = (const u32*)((u32)flags0COff + (u32)fontData);
|
||||
flagsSheets = (const u32*)(flagsSheetsOff + (u32)fontData);
|
||||
flagsCWDH = (const u32*)(flagsCWDHOff + (u32)fontData);
|
||||
flagsCMAP = (const u32*)(flagsCMAPOff + (u32)fontData);
|
||||
|
||||
loadedSheetCount = 0;
|
||||
loadedSmth0ASize = 0;
|
||||
loadedSmth0CSize = 0;
|
||||
loadedCWDHSize = 0;
|
||||
loadedCMAPSize = 0;
|
||||
|
||||
// Get the NUMBER of sheets that should be loaded
|
||||
for (i = 0, entryI = 0; entryI < pGlgr->inner.sheetCount; entryI += 0x20, i++) {
|
||||
offsetFlags = (const u8*)flagsSheets + i * sizeof(u32);
|
||||
|
||||
flagWord = 0;
|
||||
for (j = 0, offsetPGlgr = pGlgr; j < pGlgr->inner.nameCount;
|
||||
offsetPGlgr = (const HeaderedGlyphGroups*)((const u8*)offsetPGlgr + 2), j++) {
|
||||
groupName = (const char*)((u32)offsetPGlgr->inner.nameOffsets[0] + (u32)fontData);
|
||||
// MWCC needs the header as the induction base for the name-offset loads.
|
||||
for (j = 0, groupHeaderCursor = pGlgr; j < pGlgr->inner.nameCount;
|
||||
groupHeaderCursor = (const HeaderedGlyphGroups*)((const u8*)groupHeaderCursor + 2), j++) {
|
||||
groupName = (const char*)((u32)groupHeaderCursor->inner.nameOffsets[0] + (u32)fontData);
|
||||
if (*includedGroups == '\0' || detail::ArchiveFontBase::IncludeName(includedGroups, groupName)) {
|
||||
flagWord |= *(const u32*)((const u8*)offsetFlags + ROUNDDOWN(j * stepSheets, 4));
|
||||
flagWord |= *(const u32*)(offsetFlags + ROUNDDOWN(j * stepSheets, 4));
|
||||
}
|
||||
}
|
||||
|
||||
loadedSheetCount += math::CntBit1(flagWord);
|
||||
}
|
||||
// getLoadedSheetCount(pGlgr, flagsSheets, stepSheets, fontData, includedGroups, &loadedSheetCount);
|
||||
|
||||
// Get the SIZE of unk_0x0a that should be loaded
|
||||
for (i = 0; i * 32 < pGlgr->inner.smthCount_0x0a; i++) {
|
||||
offsetFlags = (const u8*)flags0A + i * sizeof(u32);
|
||||
for (i = 0; i * 32 < pGlgr->inner.cwdhCount; i++) {
|
||||
offsetFlags = (const u8*)flagsCWDH + i * sizeof(u32);
|
||||
|
||||
flagWord = 0;
|
||||
for (j = 0; j < pGlgr->inner.nameCount; j++) {
|
||||
groupOffset = pGlgr->inner.nameOffsets[j];
|
||||
groupName = (const char*)(groupOffset + (u32)fontData);
|
||||
if (*includedGroups == '\0' || detail::ArchiveFontBase::IncludeName(includedGroups, groupName)) {
|
||||
flagWord |= *(const u32*)((const u8*)offsetFlags + ROUNDDOWN(j * step0A, 4));
|
||||
flagWord |= *(const u32*)(offsetFlags + ROUNDDOWN(j * stepCWDH, 4));
|
||||
}
|
||||
}
|
||||
|
||||
offsetData = (const u32*)data0A + i * 32;
|
||||
offsetData = dataCWDH + i * 32;
|
||||
for (j = 0; j < 32; j++) {
|
||||
if ((flagWord << j) & 0x80000000U) {
|
||||
loadedSmth0ASize += offsetData[j] - sizeof(BinaryBlockHeader);
|
||||
loadedCWDHSize += offsetData[j] - sizeof(BinaryBlockHeader);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Get the SIZE of unk_0x0C that should be loaded
|
||||
for (i = 0; i * 32 < pGlgr->inner.smthCount_0x0c; i++) {
|
||||
offsetFlags = (const u8*)flags0C + i * sizeof(u32);
|
||||
for (i = 0; i * 32 < pGlgr->inner.cmapCount; i++) {
|
||||
offsetFlags = (const u8*)flagsCMAP + i * sizeof(u32);
|
||||
|
||||
flagWord = 0;
|
||||
for (j = 0; j < pGlgr->inner.nameCount; j++) {
|
||||
groupOffset = pGlgr->inner.nameOffsets[j];
|
||||
groupName = (const char*)(groupOffset + (u32)fontData);
|
||||
if (*includedGroups == '\0' || detail::ArchiveFontBase::IncludeName(includedGroups, groupName)) {
|
||||
flagWord |= *(const u32*)((const u8*)offsetFlags + ROUNDDOWN(j * step0C, 4));
|
||||
flagWord |= *(const u32*)(offsetFlags + ROUNDDOWN(j * stepCMAP, 4));
|
||||
}
|
||||
}
|
||||
|
||||
offsetData = (const u32*)data0C + i * 32;
|
||||
offsetData = dataCMAP + i * 32;
|
||||
for (j = 0; j < 32; j++) {
|
||||
if ((flagWord << j) & 0x80000000U) {
|
||||
loadedSmth0CSize += offsetData[j] - sizeof(BinaryBlockHeader);
|
||||
loadedCMAPSize += offsetData[j] - sizeof(BinaryBlockHeader);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Calculate the final buffer size based on the three previously
|
||||
// accessed components
|
||||
sheetOffsetsSize = ROUNDUP(pGlgr->inner.sheetCount * 2, 4);
|
||||
loadedSheetsSize = ROUNDUP(loadedSheetCount * pGlgr->inner.uncompSheetSize, 4);
|
||||
|
||||
loadedSizeRef = loadedSmth0ASize + loadedSmth0CSize;
|
||||
neededCharacterSizeRef = sizeof(CXUncompContextHuffman);
|
||||
if (loadedSizeRef >= sizeof(CXUncompContextHuffman)) {
|
||||
neededCharacterSize = loadedSizeRef;
|
||||
}
|
||||
loadedCharacterSize = loadedCWDHSize + loadedCMAPSize;
|
||||
neededCharacterSize = ut::Max<u32>(loadedCharacterSize, sizeof(CXUncompContextHuffman));
|
||||
|
||||
baseSize = OSRoundUp32B(sizeof(FontInformation) + sizeof(FontTextureGlyph) + sheetOffsetsSize);
|
||||
return (baseSize + loadedSheetsSize) + neededCharacterSize;
|
||||
|
||||
@@ -74,16 +74,6 @@ namespace nw4r {
|
||||
}
|
||||
}
|
||||
|
||||
// u32 ArchiveFontBase::ConstructContext::updateTextureBlockPtr() {
|
||||
// u32 imgDataOffset;
|
||||
// imgDataOffset = (u32)pFontInfo->pGlyph->sheetImage;
|
||||
|
||||
// pWorkCurr = (u8*)ROUNDUP((u32)pWorkCurr, 0x20);
|
||||
// pFontInfo->pGlyph->sheetImage = pWorkCurr;
|
||||
|
||||
// return imgDataOffset;
|
||||
// }
|
||||
|
||||
ArchiveFontBase::ArchiveFontBase() : pSheetOffsets(NULL) {
|
||||
}
|
||||
|
||||
@@ -126,24 +116,6 @@ namespace nw4r {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check that there is nothing but spaces between the substr
|
||||
// and the preceeding comma
|
||||
// - Fails:
|
||||
// - groupList = "foo, BAD bar, baz"
|
||||
// - substr ^
|
||||
// - Succeeds:
|
||||
// - groupList = "foo, bar, baz"
|
||||
// - substr ^
|
||||
// - Succeeds:
|
||||
// - groupList = "foo,bar,baz"
|
||||
// - substr ^
|
||||
// - Succeeds:
|
||||
// - groupList = "foo,bar,baz"
|
||||
// - substr ^
|
||||
// - Fails (I think this is a bug):
|
||||
// - groupList = " foo, bar, baz"
|
||||
// - substr ^
|
||||
// @bug Should allow for leading spaces in groupList (maybe?)
|
||||
if (substr != groupList) {
|
||||
const char* backsearchStr = substr - 1;
|
||||
while (backsearchStr > groupList && *backsearchStr == ' ') {
|
||||
@@ -154,11 +126,6 @@ namespace nw4r {
|
||||
}
|
||||
}
|
||||
|
||||
// Get the length of the section up until the next comma or
|
||||
// the end
|
||||
// - substr = "foo bar, baz" -> sectionLen = 7
|
||||
// - substr = "foo , baz" -> sectionLen = 11
|
||||
// - substr = "foo" -> sectionLen = 3
|
||||
const char* nextComma = strchr(substr, ',');
|
||||
u32 sectionLen;
|
||||
if (nextComma != NULL) {
|
||||
@@ -167,17 +134,6 @@ namespace nw4r {
|
||||
sectionLen = strlen(substr);
|
||||
}
|
||||
|
||||
// Check to make sure there is nothing except spaces between
|
||||
// the end of the group name and the next comma:
|
||||
// - Fails:
|
||||
// - substr = "foo bar, baz"
|
||||
// - group = "foo"
|
||||
// - Succeeds:
|
||||
// - substr = "foo , baz"
|
||||
// - group = "foo"
|
||||
// - Succeeds:
|
||||
// - substr = "foo, baz"
|
||||
// - group = "foo"
|
||||
const char* sectionEnd = substr + groupLen;
|
||||
while (sectionEnd < substr + sectionLen && (*sectionEnd == ' ')) {
|
||||
sectionEnd++;
|
||||
@@ -313,11 +269,6 @@ namespace nw4r {
|
||||
ctx->pSheetOffsets = (u16*)sheetOffsets;
|
||||
}
|
||||
|
||||
// inline u32 getOffsetSize(void* fontData, u32 remWorkSpace, u16 countSheet, u16** sheetOffsetsScratch) {
|
||||
// u32 sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
|
||||
// *sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)fontData + remWorkSpace) - sheetOffsetsSize, 2);
|
||||
// return sheetOffsetsSize;
|
||||
// }
|
||||
class FontGlyphGroupsAcs {
|
||||
public:
|
||||
explicit FontGlyphGroupsAcs(const ArchiveFontBinaryLayout* font)
|
||||
@@ -393,8 +344,8 @@ namespace nw4r {
|
||||
dataBlockCount = font->hdr.dataBlocks;
|
||||
countSheet = gg.GetNumSheet();
|
||||
const u32 stepSheetFlags = detail::CalcSizeFlagSet(countSheet);
|
||||
flagsSheetsOff = detail::CalcOffsetSheetFlags(gg.GetGroups().nameCount, countSheet, gg.GetGroups().smthCount_0x0a,
|
||||
gg.GetGroups().smthCount_0x0c);
|
||||
flagsSheetsOff = detail::CalcOffsetSheetFlags(gg.GetGroups().nameCount, countSheet, gg.GetGroups().cwdhCount,
|
||||
gg.GetGroups().cmapCount);
|
||||
flagsSheets = (const u32*)((flagsSheetsOff & ~3) + (u32)font);
|
||||
gg.SetSheetFlags(stepSheetFlags, flagsSheets);
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
Color CharWriter::GetTextColor() const {
|
||||
return *reinterpret_cast<const Color*>(&mTextColor);
|
||||
return mTextColor.start;
|
||||
}
|
||||
|
||||
void CharWriter::SetScale(f32 hScale, f32 vScale) {
|
||||
@@ -274,8 +274,8 @@ namespace nw4r {
|
||||
if (loadInfo != mLoadingTexture) {
|
||||
GXTexObj tobj;
|
||||
|
||||
GXInitTexObj(&tobj, glyph.pTexture, glyph.texWidth, glyph.texHeight, glyph.texFormat, GX_CLAMP, GX_CLAMP, 0);
|
||||
GXInitTexObjLOD(&tobj, mFilter.atSmall, mFilter.atLarge, 0.0f, 0.0f, 0.0f, false, false, GX_ANISO_1);
|
||||
GXInitTexObj(&tobj, glyph.pTexture, glyph.texWidth, glyph.texHeight, glyph.texFormat, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
GXInitTexObjLOD(&tobj, mFilter.atSmall, mFilter.atLarge, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
|
||||
GXLoadTexObj(&tobj, slot);
|
||||
|
||||
mLoadingTexture = loadInfo;
|
||||
@@ -333,14 +333,14 @@ namespace nw4r {
|
||||
|
||||
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C0, GX_CC_C1, GX_CC_TEXC, GX_CC_ZERO);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_A0, GX_CA_A1, GX_CA_TEXA, GX_CA_ZERO);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
|
||||
GXSetTevOrder(GX_TEVSTAGE1, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_ZERO, GX_CC_CPREV, GX_CC_RASC, GX_CC_ZERO);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE1, GX_CA_ZERO, GX_CA_APREV, GX_CA_RASA, GX_CA_ZERO);
|
||||
GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
|
||||
SetupVertexFormat();
|
||||
}
|
||||
@@ -354,8 +354,8 @@ namespace nw4r {
|
||||
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_RASC);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_TEXA, GX_CA_RASA, GX_CA_ZERO);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
|
||||
SetupVertexFormat();
|
||||
}
|
||||
|
||||
@@ -200,10 +200,10 @@ namespace nw4r {
|
||||
|
||||
glyph->pTexture = pSheet;
|
||||
glyph->widths = GetCharWidthsFromIndex(index);
|
||||
glyph->height = static_cast<u8>(tg.cellHeight);
|
||||
glyph->height = tg.cellHeight;
|
||||
glyph->texFormat = static_cast<GXTexFmt>(tg.sheetFormat);
|
||||
glyph->texWidth = static_cast<u16>(tg.sheetWidth);
|
||||
glyph->texHeight = static_cast<u16>(tg.sheetHeight);
|
||||
glyph->texWidth = tg.sheetWidth;
|
||||
glyph->texHeight = tg.sheetHeight;
|
||||
glyph->cellX = cellPixelX + 1;
|
||||
glyph->cellY = cellPixelY + 1;
|
||||
}
|
||||
|
||||
@@ -590,7 +590,7 @@ static void replacebuffer_(s32 chan, RFLiCtrlBuffer* buffer, u8 count) {
|
||||
|
||||
offset = (count * sizeof(RFLiCtrlBuffer)) + OFFSET;
|
||||
|
||||
write = WPADWriteFaceData(chan, ((u8*)walker + OFFSET), 4, WPAD_FACE_ADDR + offset, replacecallback_);
|
||||
write = WPADWriteFaceData(chan, (walker + OFFSET), 4, WPAD_FACE_ADDR + offset, replacecallback_);
|
||||
if (write != WPAD_ERR_OK) {
|
||||
RFLiEndWorkingReason(RFLErrcode_Controllerfail, write);
|
||||
}
|
||||
|
||||
@@ -98,7 +98,7 @@ void loadopencallback_() {
|
||||
}
|
||||
}
|
||||
|
||||
RFLErrcode RFLiLoadHiddenDataAsync(RFLiHiddenCharData* data, u16 index, RFLSimpleCBArg cb, u32 arg) {
|
||||
RFLErrcode RFLiLoadHiddenDataAsync(RFLiHiddenCharData* data, u16 index, RFLSimpleCBArg cb, u32 callbackArg) {
|
||||
RFLiHiddenDBManager* manager = NULL;
|
||||
|
||||
RFLi_ASSERTLINE_RANGE(index, 0, RFL_MAX_HIDDEN_DB, 203);
|
||||
@@ -126,7 +126,7 @@ RFLErrcode RFLiLoadHiddenDataAsync(RFLiHiddenCharData* data, u16 index, RFLSimpl
|
||||
manager->loadDst = data;
|
||||
manager->loadIndex = index;
|
||||
manager->loadCallback = cb;
|
||||
manager->loadArg = arg;
|
||||
manager->loadArg = callbackArg;
|
||||
|
||||
return RFLiOpenAsync(RFLiFileType_Database, NAND_ACCESS_READ, loadopencallback_);
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ void RFLiSetupCopyTex(GXTexFmt texFmt, u16 width, u16 height, void* buf, GXColor
|
||||
GXSetPixelFmt(GX_PF_RGBA6_Z24, GX_ZC_LINEAR);
|
||||
|
||||
GXSetCopyFilter(GX_FALSE, NULL, GX_FALSE, NULL);
|
||||
GXSetCopyClamp(GX_CLAMP_TOP + GX_CLAMP_BOTTOM);
|
||||
GXSetCopyClamp(GX_CLAMP_TOP | GX_CLAMP_BOTTOM);
|
||||
|
||||
GXSetTexCopySrc(0, 0, width, height);
|
||||
GXSetTexCopyDst(width, height, texFmt, GX_FALSE);
|
||||
@@ -541,8 +541,8 @@ void RFLiSetTev4Mole() {
|
||||
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_C0);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_TEXA);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevColor(GX_TEVREG0, RFLi_MOLE_COLOR0);
|
||||
}
|
||||
|
||||
@@ -556,22 +556,22 @@ void RFLiSetTev4Mouth(u32 mouthColor) {
|
||||
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_C0, GX_CC_TEXC, GX_CC_ZERO);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_TEXA);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
|
||||
GXSetTevSwapMode(GX_TEVSTAGE1, GX_TEV_SWAP3, GX_TEV_SWAP2);
|
||||
GXSetTevOrder(GX_TEVSTAGE1, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_ZERO, GX_CC_C1, GX_CC_TEXC, GX_CC_CPREV);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE1, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
|
||||
GXSetTevSwapMode(GX_TEVSTAGE2, GX_TEV_SWAP2, GX_TEV_SWAP3);
|
||||
GXSetTevOrder(GX_TEVSTAGE2, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_ZERO, GX_CC_ONE, GX_CC_TEXC, GX_CC_CPREV);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV);
|
||||
GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
|
||||
color0 = RFLi_MOUTH_COLOR0[mouthColor];
|
||||
color1 = RFLi_MOUTH_COLOR1[mouthColor];
|
||||
|
||||
@@ -103,15 +103,15 @@ static BOOL checkHiddenData_(RFLiHiddenCharData* data) {
|
||||
|
||||
RFLiConvertHRaw2Info(data, &info);
|
||||
|
||||
if (RFLiCheckValidInfo(&info) == FALSE) {
|
||||
if (!RFLiCheckValidInfo(&info)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void updateHDBcallback_(u32 arg) {
|
||||
RFLiMiddleDatabase* db = (RFLiMiddleDatabase*)arg;
|
||||
static void updateHDBcallback_(u32 databaseAddr) {
|
||||
RFLiMiddleDatabase* db = (RFLiMiddleDatabase*)databaseAddr;
|
||||
RFL_NEW_OLD_PARAM* param = (RFL_NEW_OLD_PARAM*)&db->userdata1;
|
||||
|
||||
if (RFLGetAsyncStatus() == RFLErrcode_Success || RFLGetAsyncStatus() == RFLErrcode_Broken) {
|
||||
@@ -299,8 +299,8 @@ static void loadHiddenRandomSync_(RFLiMiddleDatabase* db) {
|
||||
RFLiGetManager()->mLastErrcode = db->storedSize < db->size ? RFLErrcode_DBNodata : RFLErrcode_Success;
|
||||
}
|
||||
|
||||
static void updateHDBRandcallback_(u32 arg) {
|
||||
RFLiMiddleDatabase* db = (RFLiMiddleDatabase*)arg;
|
||||
static void updateHDBRandcallback_(u32 databaseAddr) {
|
||||
RFLiMiddleDatabase* db = (RFLiMiddleDatabase*)databaseAddr;
|
||||
RFL_HIDDEN_RANDOM_PARAM* param = (RFL_HIDDEN_RANDOM_PARAM*)&db->userdata1;
|
||||
|
||||
if (RFLGetAsyncStatus() == RFLErrcode_Success || RFLGetAsyncStatus() == RFLErrcode_Broken) {
|
||||
@@ -387,7 +387,7 @@ static void updateHiddenRandom_(RFLiMiddleDatabase* db, BOOL use_cache) {
|
||||
RFLi_ASSERTLINE(aidx == count, 514);
|
||||
|
||||
for (i = 0; i < (count - 1); i++) {
|
||||
u16 tmp;
|
||||
u16 shuffledIndex;
|
||||
u16 target;
|
||||
|
||||
target = (((rand >> 0x10) + rand) & 0xFFFF) % (count - 1);
|
||||
@@ -395,9 +395,9 @@ static void updateHiddenRandom_(RFLiMiddleDatabase* db, BOOL use_cache) {
|
||||
target++;
|
||||
}
|
||||
|
||||
tmp = array[target];
|
||||
shuffledIndex = array[target];
|
||||
array[target] = array[i];
|
||||
array[i] = tmp;
|
||||
array[i] = shuffledIndex;
|
||||
|
||||
rand = 0x04F8BB63 * (rand + 0x046AC055);
|
||||
}
|
||||
@@ -586,12 +586,12 @@ RFLMiddleDBType RFLGetMiddleDBType(const RFLMiddleDatabase* db) {
|
||||
|
||||
u16 RFLGetMiddleDBSize(const RFLMiddleDatabase* db) {
|
||||
RFLi_ASSERTLINE_NULL(db, 772);
|
||||
return (u16)((RFLiMiddleDatabase*)db)->size;
|
||||
return ((RFLiMiddleDatabase*)db)->size;
|
||||
}
|
||||
|
||||
u16 RFLGetMiddleDBStoredSize(const RFLMiddleDatabase* db) {
|
||||
RFLi_ASSERTLINE_NULL(db, 789);
|
||||
return (u16)((RFLiMiddleDatabase*)db)->storedSize;
|
||||
return ((RFLiMiddleDatabase*)db)->storedSize;
|
||||
}
|
||||
|
||||
BOOL RFLiGetCharInfoMiddleDB(RFLiCharInfo* info, const RFLMiddleDatabase* db, u16 index) {
|
||||
|
||||
@@ -343,7 +343,7 @@ void RFLSetExpression(RFLCharModel* charModel, RFLExpression expression) {
|
||||
}
|
||||
|
||||
RFLExpression RFLGetExpression(const RFLCharModel* charModel) {
|
||||
const RFLiCharModel* charModel_ = (RFLiCharModel*)charModel;
|
||||
const RFLiCharModel* charModel_ = (const RFLiCharModel*)charModel;
|
||||
|
||||
RFLi_ASSERTLINE_NULL(charModel, 499);
|
||||
|
||||
@@ -351,7 +351,7 @@ RFLExpression RFLGetExpression(const RFLCharModel* charModel) {
|
||||
}
|
||||
|
||||
BOOL RFLIsAvailableExpression(const RFLCharModel* charModel, RFLExpression expression) {
|
||||
const RFLiCharModel* charModel_ = (RFLiCharModel*)charModel;
|
||||
const RFLiCharModel* charModel_ = (const RFLiCharModel*)charModel;
|
||||
|
||||
RFLi_ASSERTLINE_NULL(charModel, 518);
|
||||
|
||||
@@ -459,13 +459,13 @@ void RFLLoadMaterialSetting(const RFLDrawCoreSetting* setting) {
|
||||
}
|
||||
|
||||
void RFLDrawOpaCore(const RFLCharModel* charModel, const RFLDrawCoreSetting* setting) {
|
||||
const RFLiCharModel* charModel_ = (RFLiCharModel*)charModel;
|
||||
const RFLiCharModel* charModel_ = (const RFLiCharModel*)charModel;
|
||||
const RFLiCharModelRes* charModelRes;
|
||||
|
||||
RFLi_ASSERTLINE_NULL(charModel, 760);
|
||||
RFLi_ASSERTLINE_NULL(setting, 761);
|
||||
|
||||
charModelRes = (RFLiCharModelRes*)charModel_->resource;
|
||||
charModelRes = (const RFLiCharModelRes*)charModel_->resource;
|
||||
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST);
|
||||
|
||||
@@ -550,13 +550,13 @@ void RFLDrawOpaCore(const RFLCharModel* charModel, const RFLDrawCoreSetting* set
|
||||
}
|
||||
|
||||
void RFLDrawXluCore(const RFLCharModel* charModel, const RFLDrawCoreSetting* setting) {
|
||||
const RFLiCharModel* charModel_ = (RFLiCharModel*)charModel;
|
||||
const RFLiCharModel* charModel_ = (const RFLiCharModel*)charModel;
|
||||
const RFLiCharModelRes* charModelRes;
|
||||
|
||||
RFLi_ASSERTLINE_NULL(charModel, 897);
|
||||
RFLi_ASSERTLINE_NULL(setting, 898);
|
||||
|
||||
charModelRes = (RFLiCharModelRes*)charModel_->resource;
|
||||
charModelRes = (const RFLiCharModelRes*)charModel_->resource;
|
||||
|
||||
GXSetTevOrder(GX_TEVSTAGE0, setting->txcID, setting->texMapID, GX_COLOR_NULL);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_TEXA);
|
||||
@@ -607,123 +607,123 @@ void RFLiInitCharModelRes(RFLiCharModelRes* charModelRes, const RFLiCharInfo* in
|
||||
|
||||
// Init faceline shape
|
||||
{
|
||||
RFLiCharShapeRes arg;
|
||||
RFLiCharShapeRes shapeRes;
|
||||
|
||||
arg.parts = RFLiPartsShp_Faceline;
|
||||
arg.index = info->faceline.type;
|
||||
arg.vtxPosBuf = charModelRes->vtxPosFaceline;
|
||||
arg.vtxNrmBuf = charModelRes->vtxNrmFaceline;
|
||||
arg.vtxTxcBuf = charModelRes->vtxTxcFaceline;
|
||||
arg.dlBuf = charModelRes->dlFaceline;
|
||||
arg.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosFaceline));
|
||||
arg.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmFaceline));
|
||||
arg.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcFaceline));
|
||||
arg.dlBufSize = sizeof(charModelRes->dlFaceline);
|
||||
arg.noseTrans = &noseTrans;
|
||||
arg.beardTrans = &beardTrans;
|
||||
arg.hairTrans = &hairTrans;
|
||||
arg.flipX = FALSE;
|
||||
arg.transform = FALSE;
|
||||
RFLiInitShapeRes(&arg);
|
||||
shapeRes.parts = RFLiPartsShp_Faceline;
|
||||
shapeRes.index = info->faceline.type;
|
||||
shapeRes.vtxPosBuf = charModelRes->vtxPosFaceline;
|
||||
shapeRes.vtxNrmBuf = charModelRes->vtxNrmFaceline;
|
||||
shapeRes.vtxTxcBuf = charModelRes->vtxTxcFaceline;
|
||||
shapeRes.dlBuf = charModelRes->dlFaceline;
|
||||
shapeRes.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosFaceline));
|
||||
shapeRes.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmFaceline));
|
||||
shapeRes.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcFaceline));
|
||||
shapeRes.dlBufSize = sizeof(charModelRes->dlFaceline);
|
||||
shapeRes.noseTrans = &noseTrans;
|
||||
shapeRes.beardTrans = &beardTrans;
|
||||
shapeRes.hairTrans = &hairTrans;
|
||||
shapeRes.flipX = FALSE;
|
||||
shapeRes.transform = FALSE;
|
||||
RFLiInitShapeRes(&shapeRes);
|
||||
|
||||
charModelRes->dlSizeFaceline = arg.dlSize;
|
||||
charModelRes->dlSizeFaceline = shapeRes.dlSize;
|
||||
}
|
||||
|
||||
// Init cap shape
|
||||
{
|
||||
RFLiCharShapeRes arg;
|
||||
RFLiCharShapeRes shapeRes;
|
||||
|
||||
arg.parts = RFLiPartsShp_Cap;
|
||||
arg.index = info->hair.type;
|
||||
arg.vtxPosBuf = charModelRes->vtxPosCap;
|
||||
arg.vtxNrmBuf = charModelRes->vtxNrmCap;
|
||||
arg.vtxTxcBuf = charModelRes->vtxTxcCap;
|
||||
arg.dlBuf = charModelRes->dlCap;
|
||||
arg.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosCap));
|
||||
arg.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmCap));
|
||||
arg.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcCap));
|
||||
arg.dlBufSize = sizeof(charModelRes->dlCap);
|
||||
arg.flipX = info->hair.flip;
|
||||
arg.transform = TRUE;
|
||||
arg.posScale = 1.0f;
|
||||
arg.posTrans = &hairTrans;
|
||||
RFLiInitShapeRes(&arg);
|
||||
shapeRes.parts = RFLiPartsShp_Cap;
|
||||
shapeRes.index = info->hair.type;
|
||||
shapeRes.vtxPosBuf = charModelRes->vtxPosCap;
|
||||
shapeRes.vtxNrmBuf = charModelRes->vtxNrmCap;
|
||||
shapeRes.vtxTxcBuf = charModelRes->vtxTxcCap;
|
||||
shapeRes.dlBuf = charModelRes->dlCap;
|
||||
shapeRes.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosCap));
|
||||
shapeRes.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmCap));
|
||||
shapeRes.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcCap));
|
||||
shapeRes.dlBufSize = sizeof(charModelRes->dlCap);
|
||||
shapeRes.flipX = info->hair.flip;
|
||||
shapeRes.transform = TRUE;
|
||||
shapeRes.posScale = 1.0f;
|
||||
shapeRes.posTrans = &hairTrans;
|
||||
RFLiInitShapeRes(&shapeRes);
|
||||
|
||||
charModelRes->dlSizeCap = arg.dlSize;
|
||||
charModelRes->vtxPosHair = &charModelRes->vtxPosCap[arg.vtxPosSize * VTX_COORDS_IN_POS];
|
||||
charModelRes->vtxNrmHair = &charModelRes->vtxNrmCap[arg.vtxNrmSize * VTX_COORDS_IN_NRM];
|
||||
charModelRes->dlHair = charModelRes->dlNose + OSRoundUp32B(arg.dlSize) + offsetof(RFLiCharModelRes, dlCap);
|
||||
charModelRes->dlSizeCap = shapeRes.dlSize;
|
||||
charModelRes->vtxPosHair = &charModelRes->vtxPosCap[shapeRes.vtxPosSize * VTX_COORDS_IN_POS];
|
||||
charModelRes->vtxNrmHair = &charModelRes->vtxNrmCap[shapeRes.vtxNrmSize * VTX_COORDS_IN_NRM];
|
||||
charModelRes->dlHair = charModelRes->dlNose + OSRoundUp32B(shapeRes.dlSize) + offsetof(RFLiCharModelRes, dlCap);
|
||||
}
|
||||
|
||||
// Init hair shape
|
||||
{
|
||||
RFLiCharShapeRes arg;
|
||||
RFLiCharShapeRes shapeRes;
|
||||
|
||||
arg.parts = RFLiPartsShp_Hair;
|
||||
arg.index = info->hair.type;
|
||||
arg.vtxPosBuf = charModelRes->vtxPosHair;
|
||||
arg.vtxNrmBuf = charModelRes->vtxNrmHair;
|
||||
arg.dlBuf = charModelRes->dlHair;
|
||||
arg.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosCap)) -
|
||||
shapeRes.parts = RFLiPartsShp_Hair;
|
||||
shapeRes.index = info->hair.type;
|
||||
shapeRes.vtxPosBuf = charModelRes->vtxPosHair;
|
||||
shapeRes.vtxNrmBuf = charModelRes->vtxNrmHair;
|
||||
shapeRes.dlBuf = charModelRes->dlHair;
|
||||
shapeRes.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosCap)) -
|
||||
(((u32)charModelRes->vtxPosHair - (u32)charModelRes->vtxPosCap) / VTX_COORD_SIZE) / VTX_COORDS_IN_POS;
|
||||
arg.vtxNrmBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxNrmCap)) -
|
||||
shapeRes.vtxNrmBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxNrmCap)) -
|
||||
(((u32)charModelRes->vtxNrmHair - (u32)charModelRes->vtxNrmCap) / VTX_COORD_SIZE) / VTX_COORDS_IN_NRM;
|
||||
arg.dlBufSize = sizeof(charModelRes->dlCap) - ((u32)charModelRes->dlHair - (u32)charModelRes->dlCap);
|
||||
arg.flipX = info->hair.flip;
|
||||
arg.transform = TRUE;
|
||||
arg.posScale = 1.0f;
|
||||
arg.posTrans = &hairTrans;
|
||||
RFLiInitShapeRes(&arg);
|
||||
shapeRes.dlBufSize = sizeof(charModelRes->dlCap) - ((u32)charModelRes->dlHair - (u32)charModelRes->dlCap);
|
||||
shapeRes.flipX = info->hair.flip;
|
||||
shapeRes.transform = TRUE;
|
||||
shapeRes.posScale = 1.0f;
|
||||
shapeRes.posTrans = &hairTrans;
|
||||
RFLiInitShapeRes(&shapeRes);
|
||||
|
||||
charModelRes->dlSizeHair = arg.dlSize;
|
||||
charModelRes->vtxPosForehead = &charModelRes->vtxPosHair[arg.vtxPosSize * VTX_COORDS_IN_POS];
|
||||
charModelRes->vtxNrmForehead = &charModelRes->vtxNrmHair[arg.vtxNrmSize * VTX_COORDS_IN_NRM];
|
||||
charModelRes->dlForehead = charModelRes->dlHair + OSRoundUp32B(arg.dlSize);
|
||||
charModelRes->dlSizeHair = shapeRes.dlSize;
|
||||
charModelRes->vtxPosForehead = &charModelRes->vtxPosHair[shapeRes.vtxPosSize * VTX_COORDS_IN_POS];
|
||||
charModelRes->vtxNrmForehead = &charModelRes->vtxNrmHair[shapeRes.vtxNrmSize * VTX_COORDS_IN_NRM];
|
||||
charModelRes->dlForehead = charModelRes->dlHair + OSRoundUp32B(shapeRes.dlSize);
|
||||
charModelRes->flipHair = info->hair.flip;
|
||||
}
|
||||
|
||||
// Init forehead shape
|
||||
{
|
||||
RFLiCharShapeRes arg;
|
||||
RFLiCharShapeRes shapeRes;
|
||||
|
||||
arg.parts = RFLiPartsShp_Forehead;
|
||||
arg.index = info->hair.type;
|
||||
arg.vtxPosBuf = charModelRes->vtxPosForehead;
|
||||
arg.vtxNrmBuf = charModelRes->vtxNrmForehead;
|
||||
arg.dlBuf = charModelRes->dlForehead;
|
||||
arg.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosCap)) -
|
||||
shapeRes.parts = RFLiPartsShp_Forehead;
|
||||
shapeRes.index = info->hair.type;
|
||||
shapeRes.vtxPosBuf = charModelRes->vtxPosForehead;
|
||||
shapeRes.vtxNrmBuf = charModelRes->vtxNrmForehead;
|
||||
shapeRes.dlBuf = charModelRes->dlForehead;
|
||||
shapeRes.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosCap)) -
|
||||
(((u32)charModelRes->vtxPosForehead - (u32)charModelRes->vtxPosCap) / VTX_COORD_SIZE) / VTX_COORDS_IN_POS;
|
||||
arg.vtxNrmBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxNrmCap)) -
|
||||
shapeRes.vtxNrmBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxNrmCap)) -
|
||||
(((u32)charModelRes->vtxNrmForehead - (u32)charModelRes->vtxNrmCap) / VTX_COORD_SIZE) / VTX_COORDS_IN_NRM;
|
||||
arg.dlBufSize = sizeof(charModelRes->dlCap) - ((u32)charModelRes->dlForehead - (u32)charModelRes->dlCap);
|
||||
arg.flipX = info->hair.flip;
|
||||
arg.transform = TRUE;
|
||||
arg.posScale = 1.0f;
|
||||
arg.posTrans = &hairTrans;
|
||||
RFLiInitShapeRes(&arg);
|
||||
shapeRes.dlBufSize = sizeof(charModelRes->dlCap) - ((u32)charModelRes->dlForehead - (u32)charModelRes->dlCap);
|
||||
shapeRes.flipX = info->hair.flip;
|
||||
shapeRes.transform = TRUE;
|
||||
shapeRes.posScale = 1.0f;
|
||||
shapeRes.posTrans = &hairTrans;
|
||||
RFLiInitShapeRes(&shapeRes);
|
||||
|
||||
charModelRes->dlSizeForehead = arg.dlSize;
|
||||
charModelRes->dlSizeForehead = shapeRes.dlSize;
|
||||
}
|
||||
|
||||
// Init beard shape
|
||||
{
|
||||
RFLiCharShapeRes arg;
|
||||
RFLiCharShapeRes shapeRes;
|
||||
|
||||
arg.parts = RFLiPartsShp_Beard;
|
||||
arg.index = info->beard.type;
|
||||
arg.vtxPosBuf = charModelRes->vtxPosBeard;
|
||||
arg.vtxNrmBuf = charModelRes->vtxNrmBeard;
|
||||
arg.dlBuf = charModelRes->dlBeard;
|
||||
arg.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosBeard));
|
||||
arg.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmBeard));
|
||||
arg.dlBufSize = sizeof(charModelRes->dlBeard);
|
||||
arg.flipX = FALSE;
|
||||
arg.transform = TRUE;
|
||||
arg.posScale = 1.0f;
|
||||
arg.posTrans = &beardTrans;
|
||||
RFLiInitShapeRes(&arg);
|
||||
shapeRes.parts = RFLiPartsShp_Beard;
|
||||
shapeRes.index = info->beard.type;
|
||||
shapeRes.vtxPosBuf = charModelRes->vtxPosBeard;
|
||||
shapeRes.vtxNrmBuf = charModelRes->vtxNrmBeard;
|
||||
shapeRes.dlBuf = charModelRes->dlBeard;
|
||||
shapeRes.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosBeard));
|
||||
shapeRes.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmBeard));
|
||||
shapeRes.dlBufSize = sizeof(charModelRes->dlBeard);
|
||||
shapeRes.flipX = FALSE;
|
||||
shapeRes.transform = TRUE;
|
||||
shapeRes.posScale = 1.0f;
|
||||
shapeRes.posTrans = &beardTrans;
|
||||
RFLiInitShapeRes(&shapeRes);
|
||||
|
||||
charModelRes->dlSizeBeard = arg.dlSize;
|
||||
charModelRes->dlSizeBeard = shapeRes.dlSize;
|
||||
}
|
||||
|
||||
// Init nose shape
|
||||
@@ -731,7 +731,7 @@ void RFLiInitCharModelRes(RFLiCharModelRes* charModelRes, const RFLiCharInfo* in
|
||||
f32 scale;
|
||||
RFLiPositionData trans;
|
||||
{
|
||||
RFLiCharShapeRes arg;
|
||||
RFLiCharShapeRes shapeRes;
|
||||
|
||||
scale = 0.4f + 0.175f * info->nose.scale;
|
||||
|
||||
@@ -739,69 +739,69 @@ void RFLiInitCharModelRes(RFLiCharModelRes* charModelRes, const RFLiCharInfo* in
|
||||
trans.y = +noseTrans.y + -1.5f * (info->nose.y - 8);
|
||||
trans.z = noseTrans.z;
|
||||
|
||||
arg.parts = RFLiPartsShp_Nose;
|
||||
arg.index = info->nose.type;
|
||||
arg.vtxPosBuf = charModelRes->vtxPosNose;
|
||||
arg.vtxNrmBuf = charModelRes->vtxNrmNose;
|
||||
arg.dlBuf = charModelRes->dlNose;
|
||||
arg.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosNose));
|
||||
arg.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmNose));
|
||||
arg.dlBufSize = sizeof(charModelRes->dlNose);
|
||||
arg.flipX = FALSE;
|
||||
arg.transform = TRUE;
|
||||
arg.posScale = scale;
|
||||
arg.posTrans = &trans;
|
||||
RFLiInitShapeRes(&arg);
|
||||
shapeRes.parts = RFLiPartsShp_Nose;
|
||||
shapeRes.index = info->nose.type;
|
||||
shapeRes.vtxPosBuf = charModelRes->vtxPosNose;
|
||||
shapeRes.vtxNrmBuf = charModelRes->vtxNrmNose;
|
||||
shapeRes.dlBuf = charModelRes->dlNose;
|
||||
shapeRes.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosNose));
|
||||
shapeRes.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmNose));
|
||||
shapeRes.dlBufSize = sizeof(charModelRes->dlNose);
|
||||
shapeRes.flipX = FALSE;
|
||||
shapeRes.transform = TRUE;
|
||||
shapeRes.posScale = scale;
|
||||
shapeRes.posTrans = &trans;
|
||||
RFLiInitShapeRes(&shapeRes);
|
||||
|
||||
charModelRes->dlSizeNose = arg.dlSize;
|
||||
charModelRes->dlSizeNose = shapeRes.dlSize;
|
||||
}
|
||||
{
|
||||
RFLiCharShapeRes arg;
|
||||
RFLiCharShapeRes shapeRes;
|
||||
|
||||
arg.parts = RFLiPartsShp_Noseline;
|
||||
arg.index = info->nose.type;
|
||||
arg.vtxPosBuf = charModelRes->vtxPosNoseline;
|
||||
arg.vtxNrmBuf = charModelRes->vtxNrmNoseline;
|
||||
arg.vtxTxcBuf = charModelRes->vtxTxcNoseline;
|
||||
arg.dlBuf = charModelRes->dlNoseline;
|
||||
arg.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosNoseline));
|
||||
arg.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmNoseline));
|
||||
arg.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcNoseline));
|
||||
arg.dlBufSize = sizeof(charModelRes->dlNoseline);
|
||||
arg.flipX = FALSE;
|
||||
arg.transform = TRUE;
|
||||
arg.posScale = scale;
|
||||
arg.posTrans = &trans;
|
||||
RFLiInitShapeRes(&arg);
|
||||
shapeRes.parts = RFLiPartsShp_Noseline;
|
||||
shapeRes.index = info->nose.type;
|
||||
shapeRes.vtxPosBuf = charModelRes->vtxPosNoseline;
|
||||
shapeRes.vtxNrmBuf = charModelRes->vtxNrmNoseline;
|
||||
shapeRes.vtxTxcBuf = charModelRes->vtxTxcNoseline;
|
||||
shapeRes.dlBuf = charModelRes->dlNoseline;
|
||||
shapeRes.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosNoseline));
|
||||
shapeRes.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmNoseline));
|
||||
shapeRes.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcNoseline));
|
||||
shapeRes.dlBufSize = sizeof(charModelRes->dlNoseline);
|
||||
shapeRes.flipX = FALSE;
|
||||
shapeRes.transform = TRUE;
|
||||
shapeRes.posScale = scale;
|
||||
shapeRes.posTrans = &trans;
|
||||
RFLiInitShapeRes(&shapeRes);
|
||||
|
||||
charModelRes->dlSizeNoseline = arg.dlSize;
|
||||
charModelRes->dlSizeNoseline = shapeRes.dlSize;
|
||||
}
|
||||
}
|
||||
|
||||
// Init mask shape
|
||||
{
|
||||
RFLiCharShapeRes arg;
|
||||
RFLiCharShapeRes shapeRes;
|
||||
|
||||
arg.parts = RFLiPartsShp_Mask;
|
||||
arg.index = info->faceline.type;
|
||||
arg.vtxPosBuf = charModelRes->vtxPosMask;
|
||||
arg.vtxNrmBuf = charModelRes->vtxNrmMask;
|
||||
arg.vtxTxcBuf = charModelRes->vtxTxcMask;
|
||||
arg.dlBuf = charModelRes->dlMask;
|
||||
arg.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosMask));
|
||||
arg.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmMask));
|
||||
arg.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcMask));
|
||||
arg.dlBufSize = sizeof(charModelRes->dlMask);
|
||||
arg.flipX = FALSE;
|
||||
arg.transform = FALSE;
|
||||
RFLiInitShapeRes(&arg);
|
||||
shapeRes.parts = RFLiPartsShp_Mask;
|
||||
shapeRes.index = info->faceline.type;
|
||||
shapeRes.vtxPosBuf = charModelRes->vtxPosMask;
|
||||
shapeRes.vtxNrmBuf = charModelRes->vtxNrmMask;
|
||||
shapeRes.vtxTxcBuf = charModelRes->vtxTxcMask;
|
||||
shapeRes.dlBuf = charModelRes->dlMask;
|
||||
shapeRes.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosMask));
|
||||
shapeRes.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmMask));
|
||||
shapeRes.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcMask));
|
||||
shapeRes.dlBufSize = sizeof(charModelRes->dlMask);
|
||||
shapeRes.flipX = FALSE;
|
||||
shapeRes.transform = FALSE;
|
||||
RFLiInitShapeRes(&shapeRes);
|
||||
|
||||
charModelRes->dlSizeMask = arg.dlSize;
|
||||
charModelRes->dlSizeMask = shapeRes.dlSize;
|
||||
}
|
||||
|
||||
// Init glass shape
|
||||
{
|
||||
RFLiCharShapeRes arg;
|
||||
RFLiCharShapeRes shapeRes;
|
||||
f32 scale;
|
||||
RFLiPositionData trans;
|
||||
|
||||
@@ -811,23 +811,23 @@ void RFLiInitCharModelRes(RFLiCharModelRes* charModelRes, const RFLiCharInfo* in
|
||||
trans.y = 5.0f + noseTrans.y + -1.5f * (info->glass.y - 11);
|
||||
trans.z = 2.0f + noseTrans.z;
|
||||
|
||||
arg.parts = RFLiPartsShp_Glass;
|
||||
arg.index = 0;
|
||||
arg.vtxPosBuf = charModelRes->vtxPosGlass;
|
||||
arg.vtxNrmBuf = charModelRes->vtxNrmGlass;
|
||||
arg.vtxTxcBuf = charModelRes->vtxTxcGlass;
|
||||
arg.dlBuf = charModelRes->dlGlass;
|
||||
arg.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosGlass));
|
||||
arg.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmGlass));
|
||||
arg.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcGlass));
|
||||
arg.dlBufSize = sizeof(charModelRes->dlGlass);
|
||||
arg.flipX = FALSE;
|
||||
arg.transform = TRUE;
|
||||
arg.posScale = scale;
|
||||
arg.posTrans = &trans;
|
||||
RFLiInitShapeRes(&arg);
|
||||
shapeRes.parts = RFLiPartsShp_Glass;
|
||||
shapeRes.index = 0;
|
||||
shapeRes.vtxPosBuf = charModelRes->vtxPosGlass;
|
||||
shapeRes.vtxNrmBuf = charModelRes->vtxNrmGlass;
|
||||
shapeRes.vtxTxcBuf = charModelRes->vtxTxcGlass;
|
||||
shapeRes.dlBuf = charModelRes->dlGlass;
|
||||
shapeRes.vtxPosBufSize = NUM_VTX_POS(sizeof(charModelRes->vtxPosGlass));
|
||||
shapeRes.vtxNrmBufSize = NUM_VTX_NRM(sizeof(charModelRes->vtxNrmGlass));
|
||||
shapeRes.vtxTxcBufSize = NUM_VTX_TXC(sizeof(charModelRes->vtxTxcGlass));
|
||||
shapeRes.dlBufSize = sizeof(charModelRes->dlGlass);
|
||||
shapeRes.flipX = FALSE;
|
||||
shapeRes.transform = TRUE;
|
||||
shapeRes.posScale = scale;
|
||||
shapeRes.posTrans = &trans;
|
||||
RFLiInitShapeRes(&shapeRes);
|
||||
|
||||
charModelRes->dlSizeGlass = arg.dlSize;
|
||||
charModelRes->dlSizeGlass = shapeRes.dlSize;
|
||||
}
|
||||
|
||||
// Init faceline texture
|
||||
@@ -856,38 +856,38 @@ void RFLiInitCharModelRes(RFLiCharModelRes* charModelRes, const RFLiCharInfo* in
|
||||
}
|
||||
|
||||
// DEBUG NON MATCH (https://decomp.me/scratch/mQdEd)
|
||||
void RFLiInitShapeRes(RFLiCharShapeRes* arg /* r30 */) {
|
||||
void RFLiInitShapeRes(RFLiCharShapeRes* shapeRes /* r30 */) {
|
||||
void* res; // r31+0xE8
|
||||
u8* ptr8; // r29
|
||||
BOOL skipTxc; // r31+0xE4
|
||||
|
||||
static const u32 csHeader[RFLiPartsShp_Max] = {'nose', 'frhd', 'face', 'hair', 'cap_', 'berd', 'nsln', 'mask', 'glas'};
|
||||
|
||||
RFLi_ASSERTLINE_NULL(arg, 1261);
|
||||
RFLi_ASSERTLINE_NULL(arg->vtxPosBuf, 1262);
|
||||
RFLi_ASSERTLINE_NULL(arg->vtxNrmBuf, 1263);
|
||||
RFLi_ASSERTLINE_NULL(arg->dlBuf, 1264);
|
||||
RFLi_ASSERTLINE_ALIGN(arg->dlBuf, 32, 1265);
|
||||
RFLi_ASSERTLINE_NULL(shapeRes, 1261);
|
||||
RFLi_ASSERTLINE_NULL(shapeRes->vtxPosBuf, 1262);
|
||||
RFLi_ASSERTLINE_NULL(shapeRes->vtxNrmBuf, 1263);
|
||||
RFLi_ASSERTLINE_NULL(shapeRes->dlBuf, 1264);
|
||||
RFLi_ASSERTLINE_ALIGN(shapeRes->dlBuf, 32, 1265);
|
||||
|
||||
skipTxc =
|
||||
arg->parts == RFLiPartsShp_Nose || arg->parts == RFLiPartsShp_Forehead || arg->parts == RFLiPartsShp_Hair || arg->parts == RFLiPartsShp_Beard;
|
||||
shapeRes->parts == RFLiPartsShp_Nose || shapeRes->parts == RFLiPartsShp_Forehead || shapeRes->parts == RFLiPartsShp_Hair || shapeRes->parts == RFLiPartsShp_Beard;
|
||||
|
||||
if (!skipTxc) {
|
||||
RFLi_ASSERTLINE_NULL(arg->vtxTxcBuf, 1273);
|
||||
RFLi_ASSERTLINE_NULL(shapeRes->vtxTxcBuf, 1273);
|
||||
}
|
||||
|
||||
if (arg->transform) {
|
||||
RFLi_ASSERTLINE_NULL(arg->posTrans, 1277);
|
||||
if (shapeRes->transform) {
|
||||
RFLi_ASSERTLINE_NULL(shapeRes->posTrans, 1277);
|
||||
}
|
||||
|
||||
{
|
||||
u32 fileSize = RFLiGetShapeSize(arg->parts, arg->index); // r31+0xE0
|
||||
u32 fileSize = RFLiGetShapeSize(shapeRes->parts, shapeRes->index); // r31+0xE0
|
||||
res = RFLiAlloc32(fileSize);
|
||||
RFLi_ASSERTLINE_NULL(res, 1287);
|
||||
}
|
||||
|
||||
{
|
||||
void* result = RFLiLoadShape(arg->parts, arg->index, res); // r31+0xDC
|
||||
void* result = RFLiLoadShape(shapeRes->parts, shapeRes->index, res); // r31+0xDC
|
||||
RFLi_ASSERTLINE_MSG(result, 1290, "ファイルの読み込みに失敗しました。"); // "Failed to read file."
|
||||
}
|
||||
|
||||
@@ -896,61 +896,61 @@ void RFLiInitShapeRes(RFLiCharShapeRes* arg /* r30 */) {
|
||||
|
||||
ptr8 = res;
|
||||
header = *(u32*)ptr8; // r31+0xD8
|
||||
RFLi_ASSERTLINE_MSG(header == csHeader[arg->parts], 1304, "ヘッダとpartsが一致しません"); // "Header and "parts" do not match"
|
||||
RFLi_ASSERTLINE_MSG(header == csHeader[shapeRes->parts], 1304, "ヘッダとpartsが一致しません"); // "Header and "parts" do not match"
|
||||
|
||||
ptr8 += sizeof(header);
|
||||
}
|
||||
|
||||
if (arg->parts == RFLiPartsShp_Faceline) {
|
||||
RFLi_ASSERTLINE_NULL(arg->noseTrans, 1310);
|
||||
RFLi_ASSERTLINE_NULL(arg->beardTrans, 1311);
|
||||
if (shapeRes->parts == RFLiPartsShp_Faceline) {
|
||||
RFLi_ASSERTLINE_NULL(shapeRes->noseTrans, 1310);
|
||||
RFLi_ASSERTLINE_NULL(shapeRes->beardTrans, 1311);
|
||||
// Missing assert for arg->hairTrans?
|
||||
|
||||
memcpy(arg->noseTrans, ptr8, sizeof(RFLiPositionData));
|
||||
memcpy(shapeRes->noseTrans, ptr8, sizeof(RFLiPositionData));
|
||||
ptr8 += sizeof(RFLiPositionData);
|
||||
memcpy(arg->beardTrans, ptr8, sizeof(RFLiPositionData));
|
||||
memcpy(shapeRes->beardTrans, ptr8, sizeof(RFLiPositionData));
|
||||
ptr8 += sizeof(RFLiPositionData);
|
||||
memcpy(arg->hairTrans, ptr8, sizeof(RFLiPositionData));
|
||||
memcpy(shapeRes->hairTrans, ptr8, sizeof(RFLiPositionData));
|
||||
ptr8 += sizeof(RFLiPositionData);
|
||||
}
|
||||
|
||||
{
|
||||
u16 size = *(u16*)ptr8; // r31+0xA
|
||||
if (size == 0) {
|
||||
arg->vtxPosSize = 0;
|
||||
arg->vtxNrmSize = 0;
|
||||
arg->vtxTxcSize = 0;
|
||||
shapeRes->vtxPosSize = 0;
|
||||
shapeRes->vtxNrmSize = 0;
|
||||
shapeRes->vtxTxcSize = 0;
|
||||
|
||||
arg->dlSize = 0;
|
||||
shapeRes->dlSize = 0;
|
||||
|
||||
RFLiFree(res);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
arg->vtxPosSize = *(u16*)ptr8;
|
||||
RFLi_ASSERTLINE_MSG(arg->vtxPosSize <= arg->vtxPosBufSize, 1351, "vtxPosSize(%d) > vtxPosBufSize(%d) parts:%d index:%d", arg->vtxPosSize,
|
||||
arg->vtxPosBufSize, arg->parts, arg->index);
|
||||
ptr8 += sizeof(arg->vtxPosSize);
|
||||
shapeRes->vtxPosSize = *(u16*)ptr8;
|
||||
RFLi_ASSERTLINE_MSG(shapeRes->vtxPosSize <= shapeRes->vtxPosBufSize, 1351, "vtxPosSize(%d) > vtxPosBufSize(%d) parts:%d index:%d", shapeRes->vtxPosSize,
|
||||
shapeRes->vtxPosBufSize, shapeRes->parts, shapeRes->index);
|
||||
ptr8 += sizeof(shapeRes->vtxPosSize);
|
||||
|
||||
{
|
||||
u32 byteSize; // r31+0xD4
|
||||
s16* ptr16; // r31+0xD0
|
||||
|
||||
ptr16 = (s16*)ptr8;
|
||||
byteSize = SIZE_VTX_POS(arg->vtxPosSize);
|
||||
byteSize = SIZE_VTX_POS(shapeRes->vtxPosSize);
|
||||
|
||||
if (arg->transform) {
|
||||
if (shapeRes->transform) {
|
||||
int i; // r31+0xCC
|
||||
s32 s = 256.0f * arg->posScale; // r31+0xC8
|
||||
s32 tx = 256.0f * arg->posTrans->x; // r31+0xC4
|
||||
s32 ty = 256.0f * arg->posTrans->y; // r31+0xC0
|
||||
s32 tz = 256.0f * arg->posTrans->z; // r31+0xBC
|
||||
s32 s = 256.0f * shapeRes->posScale; // r31+0xC8
|
||||
s32 tx = 256.0f * shapeRes->posTrans->x; // r31+0xC4
|
||||
s32 ty = 256.0f * shapeRes->posTrans->y; // r31+0xC0
|
||||
s32 tz = 256.0f * shapeRes->posTrans->z; // r31+0xBC
|
||||
|
||||
for (i = 0; i < arg->vtxPosSize; i++) {
|
||||
for (i = 0; i < shapeRes->vtxPosSize; i++) {
|
||||
s16 temp[3]; // r31+0xFC
|
||||
|
||||
if (arg->flipX) {
|
||||
if (shapeRes->flipX) {
|
||||
temp[0] = tx + ((-ptr16[0] * s) >> 8);
|
||||
} else {
|
||||
temp[0] = tx + ((ptr16[0] * s) >> 8);
|
||||
@@ -959,27 +959,27 @@ void RFLiInitShapeRes(RFLiCharShapeRes* arg /* r30 */) {
|
||||
temp[1] = ty + ((ptr16[1] * s) >> 8);
|
||||
temp[2] = tz + ((ptr16[2] * s) >> 8);
|
||||
|
||||
RFLiTransformCoordinate(&arg->vtxPosBuf[i * VTX_COORDS_IN_POS], temp);
|
||||
RFLiTransformCoordinate(&shapeRes->vtxPosBuf[i * VTX_COORDS_IN_POS], temp);
|
||||
ptr16 += VTX_COORDS_IN_POS;
|
||||
}
|
||||
} else if (arg->flipX) {
|
||||
} else if (shapeRes->flipX) {
|
||||
int i; // r31+0xB8
|
||||
|
||||
for (i = 0; i < arg->vtxPosSize; i++) {
|
||||
for (i = 0; i < shapeRes->vtxPosSize; i++) {
|
||||
s16 temp[3]; // r31+0xF4
|
||||
|
||||
temp[0] = -ptr16[0];
|
||||
temp[1] = ptr16[1];
|
||||
temp[2] = ptr16[2];
|
||||
|
||||
RFLiTransformCoordinate(&arg->vtxPosBuf[i * VTX_COORDS_IN_POS], temp);
|
||||
RFLiTransformCoordinate(&shapeRes->vtxPosBuf[i * VTX_COORDS_IN_POS], temp);
|
||||
ptr16 += VTX_COORDS_IN_POS;
|
||||
}
|
||||
} else {
|
||||
int i; // r31+0xB4
|
||||
|
||||
for (i = 0; i < arg->vtxPosSize; i++) {
|
||||
RFLiTransformCoordinate(&arg->vtxPosBuf[i * VTX_COORDS_IN_POS], ptr16);
|
||||
for (i = 0; i < shapeRes->vtxPosSize; i++) {
|
||||
RFLiTransformCoordinate(&shapeRes->vtxPosBuf[i * VTX_COORDS_IN_POS], ptr16);
|
||||
ptr16 += VTX_COORDS_IN_POS;
|
||||
}
|
||||
}
|
||||
@@ -987,9 +987,9 @@ void RFLiInitShapeRes(RFLiCharShapeRes* arg /* r30 */) {
|
||||
ptr8 += byteSize;
|
||||
}
|
||||
|
||||
arg->vtxNrmSize = *(u16*)ptr8;
|
||||
RFLi_ASSERTLINE_MSG(arg->vtxNrmSize <= arg->vtxNrmBufSize, 1415, "vtxNrmSize(%d) > vtxNrmBufSize(%d) parts:%d index:%d", arg->vtxNrmSize,
|
||||
arg->vtxNrmBufSize, arg->parts, arg->index);
|
||||
shapeRes->vtxNrmSize = *(u16*)ptr8;
|
||||
RFLi_ASSERTLINE_MSG(shapeRes->vtxNrmSize <= shapeRes->vtxNrmBufSize, 1415, "vtxNrmSize(%d) > vtxNrmBufSize(%d) parts:%d index:%d", shapeRes->vtxNrmSize,
|
||||
shapeRes->vtxNrmBufSize, shapeRes->parts, shapeRes->index);
|
||||
ptr8 += sizeof(u16);
|
||||
|
||||
{
|
||||
@@ -997,25 +997,25 @@ void RFLiInitShapeRes(RFLiCharShapeRes* arg /* r30 */) {
|
||||
s16* ptr16; // r31+0xAC
|
||||
|
||||
ptr16 = (s16*)ptr8;
|
||||
byteSize = SIZE_VTX_NRM(arg->vtxNrmSize);
|
||||
byteSize = SIZE_VTX_NRM(shapeRes->vtxNrmSize);
|
||||
|
||||
if (arg->flipX) {
|
||||
if (shapeRes->flipX) {
|
||||
int i; // r31+0xA8
|
||||
|
||||
for (i = 0; i < arg->vtxNrmSize; i++) {
|
||||
for (i = 0; i < shapeRes->vtxNrmSize; i++) {
|
||||
s16 temp[3]; // r31+0xEC
|
||||
|
||||
temp[0] = -ptr16[0];
|
||||
temp[1] = ptr16[1];
|
||||
temp[2] = ptr16[2];
|
||||
|
||||
RFLiTransformCoordinate(&arg->vtxNrmBuf[i * VTX_COORDS_IN_NRM], temp);
|
||||
RFLiTransformCoordinate(&shapeRes->vtxNrmBuf[i * VTX_COORDS_IN_NRM], temp);
|
||||
ptr16 += VTX_COORDS_IN_NRM;
|
||||
}
|
||||
} else {
|
||||
int i; // r31+0xA4
|
||||
for (i = 0; i < arg->vtxNrmSize; i++) {
|
||||
RFLiTransformCoordinate(&arg->vtxNrmBuf[i * VTX_COORDS_IN_NRM], ptr16);
|
||||
for (i = 0; i < shapeRes->vtxNrmSize; i++) {
|
||||
RFLiTransformCoordinate(&shapeRes->vtxNrmBuf[i * VTX_COORDS_IN_NRM], ptr16);
|
||||
ptr16 += VTX_COORDS_IN_NRM;
|
||||
}
|
||||
}
|
||||
@@ -1027,15 +1027,15 @@ void RFLiInitShapeRes(RFLiCharShapeRes* arg /* r30 */) {
|
||||
u32 byteSize; // r31+0xA0
|
||||
|
||||
if (skipTxc) {
|
||||
arg->vtxTxcSize = 0;
|
||||
shapeRes->vtxTxcSize = 0;
|
||||
} else {
|
||||
arg->vtxTxcSize = *(u16*)ptr8;
|
||||
RFLi_ASSERTLINE_MSG(arg->vtxTxcSize <= arg->vtxTxcBufSize, 1460, "vtxTxcSize(%d) > vtxTxcBufSize(%d) parts:%d index:%d", arg->vtxTxcSize,
|
||||
arg->vtxTxcBufSize, arg->parts, arg->index);
|
||||
shapeRes->vtxTxcSize = *(u16*)ptr8;
|
||||
RFLi_ASSERTLINE_MSG(shapeRes->vtxTxcSize <= shapeRes->vtxTxcBufSize, 1460, "vtxTxcSize(%d) > vtxTxcBufSize(%d) parts:%d index:%d", shapeRes->vtxTxcSize,
|
||||
shapeRes->vtxTxcBufSize, shapeRes->parts, shapeRes->index);
|
||||
ptr8 += sizeof(u16);
|
||||
|
||||
byteSize = SIZE_VTX_TXC(arg->vtxTxcSize);
|
||||
memcpy(arg->vtxTxcBuf, ptr8, byteSize);
|
||||
byteSize = SIZE_VTX_TXC(shapeRes->vtxTxcSize);
|
||||
memcpy(shapeRes->vtxTxcBuf, ptr8, byteSize);
|
||||
ptr8 += byteSize;
|
||||
}
|
||||
}
|
||||
@@ -1044,8 +1044,8 @@ void RFLiInitShapeRes(RFLiCharShapeRes* arg /* r30 */) {
|
||||
int primitiveNum = *ptr8++; // r31+0x9C
|
||||
int i, j; // r31+0x94
|
||||
|
||||
DCInvalidateRange(arg->dlBuf, arg->dlBufSize);
|
||||
GXBeginDisplayList(arg->dlBuf, arg->dlBufSize);
|
||||
DCInvalidateRange(shapeRes->dlBuf, shapeRes->dlBufSize);
|
||||
GXBeginDisplayList(shapeRes->dlBuf, shapeRes->dlBufSize);
|
||||
|
||||
for (i = 0; i < primitiveNum; i++) {
|
||||
u16 vtxNum = *ptr8++; // r31+0x8
|
||||
@@ -1065,7 +1065,7 @@ void RFLiInitShapeRes(RFLiCharShapeRes* arg /* r30 */) {
|
||||
GXEnd();
|
||||
}
|
||||
|
||||
arg->dlSize = GXEndDisplayList();
|
||||
shapeRes->dlSize = GXEndDisplayList();
|
||||
}
|
||||
|
||||
RFLiFree(res);
|
||||
@@ -1127,7 +1127,7 @@ void RFLiTransformCoordinate(s16* to, const s16* from) {
|
||||
}
|
||||
|
||||
void RFLDrawShape(const RFLCharModel* charModel) {
|
||||
const RFLiCharModel* charModel_ = (RFLiCharModel*)charModel;
|
||||
const RFLiCharModel* charModel_ = (const RFLiCharModel*)charModel;
|
||||
const RFLiCharModelRes* res;
|
||||
GXCullMode cullMode;
|
||||
|
||||
|
||||
@@ -408,7 +408,7 @@ RFLErrcode RFLiOpenAsync(RFLiFileType type, u8 openmode, RFLSimpleCB cb) {
|
||||
strncpy(info->openinfo.filename, filename, NAND_MAX_PATH);
|
||||
info->openinfo.filename[NAND_MAX_PATH] = 0;
|
||||
|
||||
info->openinfo.openmode = (u8)openmode;
|
||||
info->openinfo.openmode = openmode;
|
||||
info->openinfo.permission = scFilePermissions[type];
|
||||
info->openinfo.attribute = scFileAttributes[type];
|
||||
|
||||
@@ -626,8 +626,8 @@ RFLErrcode RFLiReadAsync(RFLiFileType type, void* dst, u32 size, RFLSimpleCB cb,
|
||||
|
||||
static void writecallback_(s32 result, NANDCommandBlock* block);
|
||||
|
||||
static void retryWrite_(u32 arg) {
|
||||
RFLiFileType type = (RFLiFileType)arg;
|
||||
static void retryWrite_(u32 fileType) {
|
||||
RFLiFileType type = (RFLiFileType)fileType;
|
||||
RFLiNANDAccessInfo* info = RFLiGetAccInfo(type);
|
||||
|
||||
{
|
||||
@@ -734,8 +734,8 @@ static s32 writestart_(RFLiFileType type) {
|
||||
|
||||
static void writeseekcallback_(s32 result, NANDCommandBlock* block);
|
||||
|
||||
static void retryWriteSeek_(u32 arg) {
|
||||
RFLiFileType type = (RFLiFileType)arg;
|
||||
static void retryWriteSeek_(u32 fileType) {
|
||||
RFLiFileType type = (RFLiFileType)fileType;
|
||||
RFLiNANDAccessInfo* info = RFLiGetAccInfo(type);
|
||||
|
||||
{
|
||||
|
||||
@@ -349,7 +349,7 @@ RFLErrcode makeNWC24MsgforExchange_(NWC24MsgObj* obj, RFLCharData* sendTarget, B
|
||||
RFLi_ASSERTLINE(aidx <= count, 407);
|
||||
|
||||
for (i = 0; i < aidx - 1; i++) {
|
||||
u16 tmp;
|
||||
u16 shuffledIndex;
|
||||
u16 target;
|
||||
|
||||
target = (((rand >> 0x10) + rand) & 0xFFFF) % (aidx - 1);
|
||||
@@ -357,9 +357,9 @@ RFLErrcode makeNWC24MsgforExchange_(NWC24MsgObj* obj, RFLCharData* sendTarget, B
|
||||
target++;
|
||||
}
|
||||
|
||||
tmp = array[target];
|
||||
shuffledIndex = array[target];
|
||||
array[target] = array[i];
|
||||
array[i] = tmp;
|
||||
array[i] = shuffledIndex;
|
||||
|
||||
rand = (rand + 0x02ED47B1) * 0x032ED8B7;
|
||||
}
|
||||
@@ -447,14 +447,14 @@ RFLErrcode makeNWC24MsgforExchange_(NWC24MsgObj* obj, RFLCharData* sendTarget, B
|
||||
int k;
|
||||
|
||||
for (k = 0; k < friendsNum; k++) {
|
||||
NWC24FriendInfo* tmp;
|
||||
NWC24FriendInfo* shuffledFriend;
|
||||
u32 l;
|
||||
|
||||
rand = (rand + 0x02ED47B1) * 0x032ED8B7;
|
||||
l = rand % friendsNum;
|
||||
tmp = lists[k];
|
||||
shuffledFriend = lists[k];
|
||||
lists[k] = lists[l];
|
||||
lists[l] = tmp;
|
||||
lists[l] = shuffledFriend;
|
||||
}
|
||||
|
||||
for (i = 0; i < (int)GET_ARRAY_LENGTH(receiver); i++) {
|
||||
|
||||
@@ -86,7 +86,7 @@ RFLErrcode RFLInitResAsync(void* workBuffer, void* resBuffer, u32 resSize, BOOL
|
||||
} else {
|
||||
size = (RFLi_WORK_SIZE - sizeof(RFLiSysManager));
|
||||
}
|
||||
RFLiGetManager()->mRootHeap = MEMCreateExpHeapEx(RFLiGetManager()->mWorkBuffer, size, 1);
|
||||
RFLiGetManager()->mRootHeap = MEMCreateExpHeapEx(RFLiGetManager()->mWorkBuffer, size, MEM_HEAP_OPT_CLEAR_ALLOC);
|
||||
RFLi_REPORT(" rootHeap : 0x%08x - 0x%08x (%6dByte)\n", (u8*)RFLiGetManager()->mWorkBuffer,
|
||||
(size + (u32)RFLiGetManager()->mWorkBuffer), size);
|
||||
}
|
||||
@@ -318,6 +318,7 @@ s32 RFLGetLastReason() {
|
||||
}
|
||||
|
||||
RFLErrcode RFLWaitAsync() {
|
||||
/* MWCC needs the status spill and reload on each polling iteration. */
|
||||
volatile RFLErrcode errcode;
|
||||
do {
|
||||
errcode = RFLGetAsyncStatus();
|
||||
|
||||
@@ -15,26 +15,32 @@ extern "C" {
|
||||
|
||||
#define TMCC_JPEG_DEC_WORK_SIZE 0x1C00
|
||||
|
||||
enum TMCCJPEGOutputFormat {
|
||||
TMCC_JPEG_OUTPUT_RGB565 = 0,
|
||||
TMCC_JPEG_OUTPUT_RGBA8 = 1,
|
||||
TMCC_JPEG_OUTPUT_Y8U8V8 = 2
|
||||
};
|
||||
|
||||
typedef struct TMCCJPEGDecWork_t TMCCJPEGDecWork;
|
||||
|
||||
typedef s32(TMCCReadCallback)(void*, u8*, unsigned int);
|
||||
|
||||
typedef struct {
|
||||
u8 unk_0x00[0x10];
|
||||
u8 reserved[0x10];
|
||||
void* pBuf2; // 0x10
|
||||
u32 buf2Size; // 0x14
|
||||
u32 dataSize; // 0x18
|
||||
TMCCReadCallback* pCallback; // 0x1C
|
||||
void* pContext; // 0x20
|
||||
u8 unk_0x24; // 0x24
|
||||
u8 pad_0x25[0x03];
|
||||
u8 thumbnailMode; // 0x24
|
||||
u8 workBufferPadding[0x03];
|
||||
TMCCJPEGDecWork* pBuf1; // 0x28
|
||||
u8 unk_0x2C; // 0x2C
|
||||
u8 pad_0x2D[0x03];
|
||||
u8 outputFormat; // 0x2C
|
||||
u8 alignmentPadding[0x03];
|
||||
} TMCCJPEGDecInitParam;
|
||||
|
||||
typedef struct {
|
||||
u8 unk_0x00[0x0C];
|
||||
u8 reserved[0x0C];
|
||||
u16 orientation; // 0x0C
|
||||
u32 xResNum; // 0x10
|
||||
u32 xResDen; // 0x14
|
||||
@@ -49,17 +55,17 @@ typedef struct {
|
||||
u8 flashVer[4]; // 0x640
|
||||
s8 flashPixVer[4]; // 0x644
|
||||
u16 colorSpace; // 0x648
|
||||
u8 unk_0x64A[0x02];
|
||||
u8 colorSpacePadding[0x02];
|
||||
u32 pixelXDim; // 0x64C
|
||||
u32 pixelYDim; // 0x650
|
||||
u16 compressionIfd1; // 0x654
|
||||
u8 unk_0x656[0x02];
|
||||
u8 compressionPadding[0x02];
|
||||
u32 xResNumIfd1; // 0x658
|
||||
u32 xResDenIfd1; // 0x65C
|
||||
u32 planarConfigIfd1; // 0x660
|
||||
u32 yResDenIfd1; // 0x664
|
||||
u16 resUnitIfd1; // 0x668
|
||||
u8 unk_0x66A[0x02];
|
||||
u8 resolutionPadding[0x02];
|
||||
u32 thumbnailOffset; // 0x66C
|
||||
u32 thumbnailLength; // 0x670
|
||||
u8* thumbnailData; // 0x674
|
||||
@@ -67,26 +73,47 @@ typedef struct {
|
||||
} TMCCJPEGDecExifData;
|
||||
|
||||
typedef struct {
|
||||
u8 unk_0x00[0x04];
|
||||
u16 posX;
|
||||
u16 posY;
|
||||
s32 position; // 0x04
|
||||
u8 unk_0x08[0x04];
|
||||
u8 reserved[0x04];
|
||||
u32 state; // 0x0C
|
||||
u8 unk_0x10[0x10];
|
||||
u8 exifFlags; // 0x20
|
||||
u8 thumbFlag; // 0x21
|
||||
u8 unk_0x22[0x2A];
|
||||
u16 maxX;
|
||||
u16 maxY;
|
||||
u8 stepX;
|
||||
u8 stepY;
|
||||
u8 stepXExt;
|
||||
u8 stepYExt;
|
||||
u32 dataSizeX;
|
||||
u32 dataSizeY;
|
||||
u8 scaleFactor; // 0x20
|
||||
u8 noEoiCheck; // 0x21
|
||||
u8 componentCount;
|
||||
u8 dimensionPadding;
|
||||
u16 jpegWidth;
|
||||
u16 jpegHeight;
|
||||
u16 outputWidth;
|
||||
u16 outputHeight;
|
||||
u32 convWidth;
|
||||
u32 convHeight;
|
||||
u32 chromaWidth;
|
||||
u32 chromaHeight;
|
||||
u8* pLumaBuffer;
|
||||
u8* pCbBuffer;
|
||||
u8* pCrBuffer;
|
||||
void* pTexBuffer;
|
||||
TMCCJPEGDecExifData exifData; // 0x4C
|
||||
TMCCJPEGDecWork* pWorkBuf; // 0x6C8
|
||||
u8 unk_0x6CC[0x04];
|
||||
s32 decodeResult;
|
||||
u8 converterType; // 0x6D0
|
||||
u8 unk_0x6D1[0x03];
|
||||
u8 alignmentPadding[0x03];
|
||||
} TMCCJPEGDecExifInfo;
|
||||
|
||||
typedef struct {
|
||||
u16 posX; // 0x00
|
||||
u16 posY; // 0x02
|
||||
s32 position; // 0x04
|
||||
u8 unk_0x08[0x04];
|
||||
u8 reserved[0x04];
|
||||
u32 result; // 0x0C
|
||||
u16 maxX; // 0x10
|
||||
u16 maxY; // 0x12
|
||||
@@ -97,30 +124,26 @@ typedef struct {
|
||||
u32 dataSizeX; // 0x18
|
||||
u32 dataSizeY; // 0x1C
|
||||
u8 scaleFactor; // 0x20
|
||||
u8 unk_0x21; // 0x21
|
||||
u8 noEoiCheck; // 0x21
|
||||
u8 componentCount; // 0x22
|
||||
u8 unk_0x23; // 0x23
|
||||
u8 dimensionPadding;
|
||||
u16 jpegWidth; // 0x24
|
||||
u16 jpegHeight; // 0x26
|
||||
u16 outputWidth; // 0x28
|
||||
u16 outputHeight; // 0x2A
|
||||
u32 convWidth; // 0x2C
|
||||
u32 convHeight; // 0x30
|
||||
#ifdef TMC_JPEG_PLANAR_OUTPUT
|
||||
u32 chromaWidth;
|
||||
u32 chromaHeight;
|
||||
u8* pLumaBuffer;
|
||||
u8* pCbBuffer;
|
||||
u8* pCrBuffer;
|
||||
#else
|
||||
u8 unk_0x34[0x14]; // 0x34
|
||||
#endif
|
||||
void* pTexBuffer; // 0x48
|
||||
u8 unk_0x4C[0x67C];
|
||||
TMCCJPEGDecExifData exifData; // 0x4C
|
||||
TMCCJPEGDecWork* pWorkBuf; // 0x6C8
|
||||
s32 decodeResult; // 0x6CC
|
||||
u8 converterType; // 0x6D0
|
||||
u8 unk_0x6D1[0x03];
|
||||
u8 alignmentPadding[0x03];
|
||||
} TMCCJPEGDecState;
|
||||
|
||||
s32 TMCCJPEGDecInit(TMCCJPEGDecState* state, TMCCJPEGDecInitParam* param);
|
||||
|
||||
@@ -5,6 +5,26 @@
|
||||
|
||||
#include <tmc_jpeg.h>
|
||||
|
||||
enum TMCJpegMarker {
|
||||
TMC_JPEG_MARKER_SOF0 = 0xFFC0,
|
||||
TMC_JPEG_MARKER_SOF2 = 0xFFC2,
|
||||
TMC_JPEG_MARKER_DHT = 0xFFC4,
|
||||
TMC_JPEG_MARKER_RST0 = 0xFFD0,
|
||||
TMC_JPEG_MARKER_RST7 = 0xFFD7,
|
||||
TMC_JPEG_MARKER_SOI = 0xFFD8,
|
||||
TMC_JPEG_MARKER_EOI = 0xFFD9,
|
||||
TMC_JPEG_MARKER_SOS = 0xFFDA,
|
||||
TMC_JPEG_MARKER_DQT = 0xFFDB,
|
||||
TMC_JPEG_MARKER_DNL = 0xFFDC,
|
||||
TMC_JPEG_MARKER_DRI = 0xFFDD,
|
||||
TMC_JPEG_MARKER_APP0 = 0xFFE0,
|
||||
TMC_JPEG_MARKER_APP1 = 0xFFE1,
|
||||
TMC_JPEG_MARKER_APP15 = 0xFFEF,
|
||||
TMC_JPEG_MARKER_COM = 0xFFFE,
|
||||
TMC_JPEG_MARKER_PREFIX = 0xFF00,
|
||||
TMC_JPEG_MARKER_FILL = 0xFFFF,
|
||||
};
|
||||
|
||||
typedef s32(TMCDecodeFunc)(s32* block, u8* conv_row_ptr, u32* dcPredictRowPtr, TMCCJPEGDecWork* work);
|
||||
typedef void(TMCIdctFunc)(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag);
|
||||
typedef void(TMCConverterFunc)(TMCCJPEGDecWork*, s32 x, s32 y);
|
||||
@@ -13,44 +33,33 @@ typedef void(TMCConverterFunc)(TMCCJPEGDecWork*, s32 x, s32 y);
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
// TODO: The following two structs are subsets of TMCCJPEGDecWork.
|
||||
// Their members in TMCCJPEGDecWork should eventually be removed and replaced with these structs as a member.
|
||||
// Some code accesses scaleFlag, frameWidth and convBuf as a pointer and uses them as a base to do further pointer arithmetic on,
|
||||
// so they likely were nested structs.
|
||||
typedef struct {
|
||||
u8 scaleFlag; // 0x00
|
||||
u8 unk_0x01[0x3E7];
|
||||
u8* pDCACPtrs[6]; // 0x03E8-0x03FF
|
||||
u8 zigzagData[64]; // 0x0400-0x043F
|
||||
u16* pDCFast; // 0x0440
|
||||
u32* pDCHuffTbl; // 0x0444
|
||||
u8* pDCHuffSym; // 0x0448
|
||||
u32 unk_0x4A4; // 0x044C
|
||||
u16* pACFast; // 0x0450
|
||||
u32* pACHuffTbl; // 0x0454
|
||||
u8* pACHuffSym; // 0x0458
|
||||
u32 unk_0x4C5;
|
||||
u8 unk_0x460[0x1B4];
|
||||
u32 thumbHuffSize[3]; // 0x0614
|
||||
u8 unk_0x620[0x1E8];
|
||||
u8 huffDecTblDC1[0x400]; // 0x0808-0x0C07
|
||||
u8 huffDecTblAC0[0x400]; // 0x0C08-0x1007
|
||||
u8 huffDecTblAC1[0x400]; // 0x1008-0x1407
|
||||
u8 valPtrDC0[0x44]; // 0x1408-0x144B
|
||||
u8 valPtrDC1[0x44]; // 0x144C-0x148F
|
||||
u8 valPtrAC0[0x44]; // 0x1490-0x14D3
|
||||
u8 valPtrAC1[0x44]; // 0x14D4-0x1517
|
||||
u8 maxCodeDC0[0x10]; // 0x1518-0x1527
|
||||
u8 maxCodeDC1[0x10]; // 0x1528-0x1537
|
||||
u8 maxCodeAC0[0x100]; // 0x1538-0x1637
|
||||
u8 maxCodeAC1[0x100]; // 0x1638-0x1737
|
||||
u8 unk_0x1738[0x04];
|
||||
u8 huffTblInitFlag[4]; // 0x173C
|
||||
u8 unk_0x1740[0x50];
|
||||
u8 quantTblFlag[4]; // 0x1790
|
||||
u8 dcTblFlag[2]; // 0x1794
|
||||
u8 acTblFlag[2]; // 0x1796
|
||||
} TMCUnknownInfo;
|
||||
u32 coefficients[4][64];
|
||||
u8 zigzagData[64];
|
||||
u16* pDCFast;
|
||||
u32* pDCHuffTbl;
|
||||
u8* pDCHuffSym;
|
||||
u32 reservedDC;
|
||||
u16* pACFast;
|
||||
u32* pACHuffTbl;
|
||||
u8* pACHuffSym;
|
||||
u32 reservedAC;
|
||||
u16 huffDecTblDC0[0x200];
|
||||
u16 huffDecTblDC1[0x200];
|
||||
u16 huffDecTblAC0[0x200];
|
||||
u16 huffDecTblAC1[0x200];
|
||||
u32 valPtrDC0[17];
|
||||
u32 valPtrDC1[17];
|
||||
u32 valPtrAC0[17];
|
||||
u32 valPtrAC1[17];
|
||||
u8 maxCodeDC0[0x10];
|
||||
u8 maxCodeDC1[0x10];
|
||||
u8 maxCodeAC0[0x100];
|
||||
u8 maxCodeAC1[0x100];
|
||||
u8 quantTblFlag[4];
|
||||
u8 dcTblFlag[2];
|
||||
u8 acTblFlag[2];
|
||||
} TMCJpegTableInfo;
|
||||
|
||||
typedef struct {
|
||||
u16 frameWidth; // 0x00
|
||||
@@ -75,9 +84,18 @@ typedef struct {
|
||||
u8 maxVSamp; // 0x29
|
||||
u16 restartInterval; // 0x2A
|
||||
u8 scanCount; // 0x2C
|
||||
u8 unk_0x2D[0x03];
|
||||
u8 alignmentPadding[0x03];
|
||||
} TMCJpegFrameInfo;
|
||||
|
||||
typedef struct {
|
||||
u8 map[4];
|
||||
u32 dcPredict[4];
|
||||
u8 id[4];
|
||||
u8 quantTable[4];
|
||||
u8 dcTable[4];
|
||||
u8 acTable[4];
|
||||
} TMCFrameComponents;
|
||||
|
||||
struct TMCCJPEGDecWork_t {
|
||||
u32 bitBuf; // 0x00
|
||||
s32 bitCount; // 0x04
|
||||
@@ -90,47 +108,11 @@ struct TMCCJPEGDecWork_t {
|
||||
s32 remaining; // 0x20
|
||||
TMCCReadCallback* pCallback; // 0x24
|
||||
void* pCbCtx; // 0x28
|
||||
u8 compMap[4]; // 0x2C
|
||||
u32 dcPredict[4]; // 0x30
|
||||
u8 compId[4]; // 0x40
|
||||
u8 compQTbl[4]; // 0x44
|
||||
u8 copDCTbl[4]; // 0x48
|
||||
u8 copACTbl[4]; // 0x4C
|
||||
TMCFrameComponents components;
|
||||
u16 restartCnt; // 0x50
|
||||
u16 rstMarkerIdx; // 0x52
|
||||
u32 mcuPos; // 0x54
|
||||
// Section below is likely a nested struct
|
||||
u8 scaleFlag; // 0x58
|
||||
u8 unk_0x59[0x3E7];
|
||||
u8* pDCACPtrs[6]; // 0x440
|
||||
u8 zigzagData[64]; // 0x458
|
||||
u16* pDCFast; // 0x498
|
||||
u32* pDCHuffTbl; // 0x49C
|
||||
u8* pDCHuffSym; // 0x4A0
|
||||
u32 unk_0x4A4;
|
||||
u16* pACFast; // 0x4A8
|
||||
u32* pACHuffTbl; // 0x4AC
|
||||
u8* pACHuffSym; // 0x4B0
|
||||
u8 unk_0x4B4[0x1B8];
|
||||
u32 thumbHuffSize[3]; // 0x66C
|
||||
u8 unk_0x678[0x1E8];
|
||||
u8 huffDecTblDC1[0x400]; // 0x860-0xC5F
|
||||
u8 huffDecTblAC0[0x400]; // 0xC60-0x105F
|
||||
u8 huffDecTblAC1[0x400]; // 0x1060-0x145F
|
||||
u8 valPtrDC0[0x44]; // 0x1460-0x14A3
|
||||
u8 valPtrDC1[0x44]; // 0x14A4-0x14E7
|
||||
u8 valPtrAC0[0x44]; // 0x14E8-0x152B
|
||||
u8 valPtrAC1[0x44]; // 0x152C-0x156F
|
||||
u8 maxCodeDC0[0x10]; // 0x1570-0x157F
|
||||
u8 maxCodeDC1[0x10]; // 0x1580-0x158F
|
||||
u8 maxCodeAC0[0x100]; // 0x1590-0x168F
|
||||
u8 maxCodeAC1[0x100]; // 0x1690-0x178F
|
||||
u8 unk_0x1790[0x04];
|
||||
u8 huffTblInitFlag[4]; // 0x1794
|
||||
u8 unk_0x1798[0x50];
|
||||
u8 quantTblFlag[4]; // 0x17E8
|
||||
u8 dcTblFlag[2]; // 0x17EC
|
||||
u8 acTblFlag[2]; // 0x17EE
|
||||
TMCJpegTableInfo tables;
|
||||
// Section below is likely a nested struct
|
||||
u16 frameWidth; // 0x17F0
|
||||
u16 frameHeight; // 0x17F2
|
||||
@@ -154,7 +136,7 @@ struct TMCCJPEGDecWork_t {
|
||||
u8 maxVSamp; // 0x1819
|
||||
u16 restartInterval; // 0x181A
|
||||
u8 scanCount; // 0x181C
|
||||
u8 unk_0x181D[0x03];
|
||||
u8 framePadding[0x03];
|
||||
TMCIdctFunc* idctPtr; // 0x1820
|
||||
TMCIdctFunc* idctLumiPtr; // 0x1824
|
||||
TMCDecodeFunc* decodePtr; // 0x1828
|
||||
@@ -165,10 +147,10 @@ struct TMCCJPEGDecWork_t {
|
||||
u8* pConvRowPtrs[7]; // 0x183C
|
||||
u8 convBuf[0x184]; // 0x1858
|
||||
u8 idctMode; // 0x19DC
|
||||
u8 unk_0x19DD;
|
||||
u8 pitchPadding;
|
||||
u16 pitch; // 0x19DE
|
||||
u8 converterFlags; // 0x19E0
|
||||
u8 unk_0x19E1[0x03];
|
||||
u8 statePadding[0x03];
|
||||
TMCCJPEGDecState* pState; // 0x19E4
|
||||
};
|
||||
|
||||
@@ -187,13 +169,13 @@ s32 TMCJPEGDEC_rewind_ptr(TMCCJPEGDecWork* work);
|
||||
|
||||
typedef struct {
|
||||
u32* huffTable; // 0x00
|
||||
u8* valptr; // 0x04
|
||||
u32* valptr; // 0x04
|
||||
u32* maxCode; // 0x08
|
||||
u8 count; // 0x0C
|
||||
} TMCHuffParam;
|
||||
|
||||
s32 TMCJPEGDEC_make_huffdec(const u8* dht_spec, u8* tbl, TMCHuffParam* hp);
|
||||
void TMCJPEGDEC_set_HuffmanTable(TMCHuffParam* tbl, s32 tblType, s32 tblID, TMCUnknownInfo* work);
|
||||
void TMCJPEGDEC_set_HuffmanTable(TMCHuffParam* tbl, s32 tblType, s32 tblID, TMCJpegTableInfo* work);
|
||||
|
||||
s32 TMCJPEGDEC_decompmcu(u32 maxMCU, u32 mcuCount, TMCCJPEGDecWork* work, void* buf);
|
||||
s32 TMCJPEGDEC_imagestart(TMCCJPEGDecWork* work);
|
||||
@@ -202,7 +184,7 @@ s32 TMCJPEGDEC_scanstart(TMCCJPEGDecWork* work);
|
||||
s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work);
|
||||
s32 TMCJPEGDEC_restart_interval(TMCCJPEGDecWork* work, u32 maxMCU, u32 mcuCount);
|
||||
s32 TMCJPEGDEC_err_restart(TMCCJPEGDecWork* work);
|
||||
void TMCJPEGDEC_set_entropytbl(TMCCJPEGDecWork* work, s32 idx, u8 data);
|
||||
void TMCJPEGDEC_set_entropytbl(TMCJpegTableInfo* work, s32 idx, u8 data);
|
||||
|
||||
s32 TMCJPEGDEC_Decompscan(TMCCJPEGDecWork* work);
|
||||
s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work);
|
||||
@@ -226,11 +208,15 @@ s32 TMCJPEGDEC_set_converterY8U8V8(TMCCJPEGDecWork* work);
|
||||
s32 TMCJPEGDEC_set_converterRGB565(TMCCJPEGDecWork* work);
|
||||
s32 TMCJPEGDEC_set_converterRGBA8(TMCCJPEGDecWork* work);
|
||||
|
||||
extern const u8 TMCJPEGDEC_SampleH_N[24];
|
||||
extern const u8 TMCJPEGDEC_SampleV_N[24];
|
||||
extern const u8 TMCJPEGDEC_SampleH_N[6][4];
|
||||
extern const u8 TMCJPEGDEC_SampleV_N[6][4];
|
||||
extern const u8 TMCJPEGDEC_Zigzag_data[64];
|
||||
extern const u32 TMCJPEGDEC_Zigzag_loop[64];
|
||||
#ifdef TMC_JPEG_FRAME_PARSER
|
||||
extern const u8 TMCJPEGDEC_SampleComps[];
|
||||
#else
|
||||
extern const u8 TMCJPEGDEC_SampleComps[6];
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -1,6 +1,28 @@
|
||||
#include <string.h>
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
static inline s32 finishImageStart(TMCCJPEGDecWork* work, s32 result) {
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
if (work->frameWidth == 0) {
|
||||
return TMCC_ERROR_HEADER;
|
||||
}
|
||||
work->mcuCount = work->mcuXCount * work->mcuYCount;
|
||||
work->mcuRemCount = work->mcuXRem * work->mcuXCount2;
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline s32 finishScanStart(TMCCJPEGDecWork* work, s32 result) {
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
if (work->scanCount == 1) {
|
||||
return 0;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
s32 TMCCJPEGDecInit(TMCCJPEGDecState* state, TMCCJPEGDecInitParam* param) {
|
||||
s32 result;
|
||||
TMCCJPEGDecWork* work;
|
||||
@@ -15,15 +37,16 @@ s32 TMCCJPEGDecInit(TMCCJPEGDecState* state, TMCCJPEGDecInitParam* param) {
|
||||
work->pState = state;
|
||||
state->pWorkBuf = work;
|
||||
|
||||
if (param->unk_0x24 != 0) {
|
||||
if (param->thumbnailMode != 0) {
|
||||
result = -1;
|
||||
} else if (param->unk_0x2C != 0 && param->unk_0x2C != 1 && param->unk_0x2C != 2) {
|
||||
} else if (param->outputFormat != TMCC_JPEG_OUTPUT_RGB565 && param->outputFormat != TMCC_JPEG_OUTPUT_RGBA8 &&
|
||||
param->outputFormat != TMCC_JPEG_OUTPUT_Y8U8V8) {
|
||||
result = -1;
|
||||
} else {
|
||||
state->unk_0x21 = param->unk_0x24;
|
||||
state->noEoiCheck = param->thumbnailMode;
|
||||
result = 0;
|
||||
state->scaleFactor = 1;
|
||||
state->converterType = param->unk_0x2C;
|
||||
state->converterType = param->outputFormat;
|
||||
}
|
||||
|
||||
if (result < 0) {
|
||||
@@ -36,17 +59,13 @@ s32 TMCCJPEGDecInit(TMCCJPEGDecState* state, TMCCJPEGDecInitParam* param) {
|
||||
}
|
||||
|
||||
result = TMCJPEGDEC_imagestart(work);
|
||||
result = (result < 0) ?
|
||||
result :
|
||||
((work->frameWidth == 0) ?
|
||||
TMCC_ERROR_HEADER :
|
||||
((work->mcuCount = work->mcuXCount * work->mcuYCount, work->mcuRemCount = work->mcuXRem * work->mcuXCount2), result));
|
||||
result = finishImageStart(work, result);
|
||||
if (result < 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
result = TMCJPEGDEC_scanstart(work);
|
||||
result = (result < 0) ? result : ((work->scanCount == 1) ? 0 : result);
|
||||
result = finishScanStart(work, result);
|
||||
if (result < 0) {
|
||||
goto error;
|
||||
}
|
||||
@@ -58,19 +77,19 @@ s32 TMCCJPEGDecInit(TMCCJPEGDecState* state, TMCCJPEGDecInitParam* param) {
|
||||
result = TMCJPEGDEC_Setsize(work);
|
||||
if (result >= 0) {
|
||||
switch (state->converterType) {
|
||||
case 0:
|
||||
case TMCC_JPEG_OUTPUT_RGB565:
|
||||
result = TMCJPEGDEC_set_converterRGB565(work);
|
||||
if (result < 0) {
|
||||
goto error;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
case TMCC_JPEG_OUTPUT_RGBA8:
|
||||
result = TMCJPEGDEC_set_converterRGBA8(work);
|
||||
if (result < 0) {
|
||||
goto error;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
case TMCC_JPEG_OUTPUT_Y8U8V8:
|
||||
result = TMCJPEGDEC_set_converterY8U8V8(work);
|
||||
if (result < 0) {
|
||||
goto error;
|
||||
@@ -104,7 +123,7 @@ s32 TMCCJPEGDecodeRGB565(TMCCJPEGDecState* state, s32 initResult, void* texBuffe
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (state->converterType != 0) {
|
||||
if (state->converterType != TMCC_JPEG_OUTPUT_RGB565) {
|
||||
return -4;
|
||||
}
|
||||
|
||||
@@ -173,19 +192,19 @@ s32 TMCCJPEGDecSetResolution(TMCCJPEGDecState* state, u32 scale) {
|
||||
}
|
||||
|
||||
switch (state->converterType) {
|
||||
case 0:
|
||||
case TMCC_JPEG_OUTPUT_RGB565:
|
||||
result = TMCJPEGDEC_set_converterRGB565(work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
case TMCC_JPEG_OUTPUT_RGBA8:
|
||||
result = TMCJPEGDEC_set_converterRGBA8(work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
case TMCC_JPEG_OUTPUT_Y8U8V8:
|
||||
result = TMCJPEGDEC_set_converterY8U8V8(work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
|
||||
@@ -10,9 +10,12 @@ static TMCHuffmanEntry readHuffmanEntry(const TMCHuffmanEntry* entries, u32 inde
|
||||
return entries[index];
|
||||
}
|
||||
|
||||
static void readHuffmanLimit(const TMCHuffmanEntry* entries, TMCHuffmanEntry* limit) {
|
||||
limit->bitLength = entries->bitLength;
|
||||
limit->symbol = entries->symbol;
|
||||
static inline BOOL exceedsHuffmanLimit(u32 code, const u16* entry, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
||||
limit->bitLength = entry[0];
|
||||
limit->symbol = entry[1];
|
||||
/* MWCC needs the entry copy before reloading its bit length. */
|
||||
*decoded = *limit;
|
||||
return code > decoded->bitLength;
|
||||
}
|
||||
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, u32* huff_tbl, u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
||||
@@ -34,8 +37,7 @@ static inline s32 decodeLongHuffman(s32 bitCount, u32* huff_tbl, u8* symbols, TM
|
||||
bitCount -= 9;
|
||||
code = (bitData >> bitCount) & 0x1FF;
|
||||
work->bitCount = bitCount;
|
||||
goto read_entry;
|
||||
while (1) {
|
||||
while (exceedsHuffmanLimit(code, entry, limit, decoded)) {
|
||||
length++;
|
||||
entry += 2;
|
||||
if (length > 16) {
|
||||
@@ -47,69 +49,11 @@ static inline s32 decodeLongHuffman(s32 bitCount, u32* huff_tbl, u8* symbols, TM
|
||||
bitCount--;
|
||||
work->bitCount = bitCount;
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
limit->bitLength = entry[0];
|
||||
limit->symbol = entry[1];
|
||||
*decoded = *limit;
|
||||
if (code > (u32)decoded->bitLength) {
|
||||
continue;
|
||||
}
|
||||
{
|
||||
u32 relativeCode = code - limit->bitLength;
|
||||
u32 symbolIndex = relativeCode + limit->symbol;
|
||||
return symbols[symbolIndex & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline s32 decodeACHuffman(s32 bitCount, u32* huff_tbl, u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
||||
u16* entry;
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
|
||||
if (bitCount <= 17) {
|
||||
s32 result = TMCJPEGDEC_load_buff(work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
entry = (u16*)(huff_tbl + 9);
|
||||
bitData = work->bitBuf;
|
||||
length = 9;
|
||||
bitCount -= 9;
|
||||
code = (bitData >> bitCount) & 0x1FF;
|
||||
work->bitCount = bitCount;
|
||||
goto read_entry;
|
||||
while (1) {
|
||||
length++;
|
||||
entry += 2;
|
||||
if (length > 16) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
code <<= 1;
|
||||
bitData = work->bitBuf;
|
||||
bitCount--;
|
||||
work->bitCount = bitCount;
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
limit->bitLength = entry[0];
|
||||
limit->symbol = entry[1];
|
||||
*decoded = *limit;
|
||||
if (code > (u32)decoded->bitLength) {
|
||||
continue;
|
||||
}
|
||||
{
|
||||
u32 relativeCode = code - limit->bitLength;
|
||||
u32 symbolIndex = relativeCode + limit->symbol;
|
||||
return symbols[symbolIndex & 0xFF];
|
||||
}
|
||||
}
|
||||
{
|
||||
u32 relativeCode = code - limit->bitLength;
|
||||
u32 symbolIndex = relativeCode + limit->symbol;
|
||||
return symbols[symbolIndex & 0xFF];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -140,7 +84,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
|
||||
conv_row = (s32*)conv_row_ptr;
|
||||
bit_pos = work->bitCount;
|
||||
dc_fast = work->pDCFast;
|
||||
dc_fast = work->tables.pDCFast;
|
||||
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
@@ -161,8 +105,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
work->bitCount = bit_pos - r;
|
||||
r = extra;
|
||||
} else {
|
||||
huff_sym = work->pDCHuffSym;
|
||||
huff_tbl = work->pDCHuffTbl;
|
||||
huff_sym = work->tables.pDCHuffSym;
|
||||
huff_tbl = work->tables.pDCHuffTbl;
|
||||
r = decodeLongHuffman(bit_pos, huff_tbl, huff_sym, work, &dcLimit, &dcDecoded);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
@@ -173,7 +117,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
if (r != 0) {
|
||||
if (work->bitCount <= r) {
|
||||
s32 load_ret;
|
||||
if (load_ret = TMCJPEGDEC_load_buff(work), load_ret < 0) {
|
||||
load_ret = TMCJPEGDEC_load_buff(work);
|
||||
if (load_ret < 0) {
|
||||
return load_ret;
|
||||
}
|
||||
}
|
||||
@@ -195,9 +140,9 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
u32* ac_huff_tbl;
|
||||
u8* ac_huff_sym;
|
||||
|
||||
ac_fast = work->pACFast;
|
||||
ac_huff_tbl = work->pACHuffTbl;
|
||||
ac_huff_sym = work->pACHuffSym;
|
||||
ac_fast = work->tables.pACFast;
|
||||
ac_huff_tbl = work->tables.pACHuffTbl;
|
||||
ac_huff_sym = work->tables.pACHuffSym;
|
||||
|
||||
memset(block + 1, 0, 0xFC);
|
||||
|
||||
@@ -224,7 +169,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
r = acEntry.symbol;
|
||||
} else {
|
||||
bit_pos = work->bitCount;
|
||||
r = decodeACHuffman(bit_pos, ac_huff_tbl, ac_huff_sym, work, &acLimit, &acDecoded);
|
||||
r = decodeLongHuffman(bit_pos, ac_huff_tbl, ac_huff_sym, work, &acLimit, &acDecoded);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -278,8 +223,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos = work->bitCount;
|
||||
t = bit_pos - 8;
|
||||
tmp = ((bit_data >> t) & 0xFF) << 2;
|
||||
acEntry = readHuffmanEntry((const TMCHuffmanEntry*)ac_fast, tmp >> 2);
|
||||
tmp = (bit_data >> t) & 0xFF;
|
||||
acEntry = readHuffmanEntry((const TMCHuffmanEntry*)ac_fast, tmp);
|
||||
|
||||
idx += 16;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include <stddef.h>
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work);
|
||||
@@ -9,23 +10,24 @@ s32 TMCJPEGDEC_init_ptr_buff(TMCCJPEGDecWork* work, void* param) {
|
||||
u8* newEnd;
|
||||
u8* bufOrg;
|
||||
u32 newRemaining;
|
||||
const TMCCJPEGDecInitParam* input = (const TMCCJPEGDecInitParam*)((u8*)param - offsetof(TMCCJPEGDecInitParam, pBuf2));
|
||||
|
||||
if (((u32*)param)[0] & 0x1F)
|
||||
if ((u32)input->pBuf2 & (DEFAULT_ALIGN - 1))
|
||||
return -1;
|
||||
if (((u32*)param)[1] & 0x1F)
|
||||
if (input->buf2Size & (DEFAULT_ALIGN - 1))
|
||||
return -1;
|
||||
if (((u32*)param)[2] == 0)
|
||||
if (input->dataSize == 0)
|
||||
return -1;
|
||||
if (((u32*)param)[1] < 0x10040)
|
||||
if (input->buf2Size < 0x10040)
|
||||
return -1;
|
||||
|
||||
work->pBufOrg = (u8*)((u32*)param)[0];
|
||||
work->pBufOrg = input->pBuf2;
|
||||
dest = work->pBufOrg + 0x20;
|
||||
work->bufLen = ((u32*)param)[1] - 0x20;
|
||||
readSize = ((u32*)param)[2];
|
||||
work->bufLen = input->buf2Size - 0x20;
|
||||
readSize = input->dataSize;
|
||||
work->remaining = readSize;
|
||||
work->pCallback = (void*)((u32*)param)[3];
|
||||
work->pCbCtx = (void*)((u32*)param)[4];
|
||||
work->pCallback = input->pCallback;
|
||||
work->pCbCtx = input->pContext;
|
||||
if (work->bufLen - 0x20 < readSize) {
|
||||
readSize = work->bufLen - 0x20;
|
||||
}
|
||||
@@ -82,157 +84,139 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
|
||||
u8 byte_val;
|
||||
u32 byte_shifted;
|
||||
s32 r;
|
||||
u8 byte;
|
||||
u32 highByte;
|
||||
s32 result;
|
||||
|
||||
u8* cur;
|
||||
u8* end;
|
||||
u8* next;
|
||||
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
if (r < 0) {
|
||||
goto br;
|
||||
// MWCC needs the empty else branches to preserve refill branch direction.
|
||||
do {
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
result = refillJpegBuffer(work);
|
||||
if (result < 0) {
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
} else {
|
||||
// This else-branch is load-bearing...
|
||||
// Forces bge instead of blt.
|
||||
result = TMCC_ERROR_UNDERFLOW;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
r = TMCC_ERROR_UNDERFLOW;
|
||||
goto br;
|
||||
}
|
||||
|
||||
{
|
||||
u8* bufferCursor = work->pBufCur;
|
||||
end = work->pBufEnd;
|
||||
cur = bufferCursor;
|
||||
next = bufferCursor + 1;
|
||||
}
|
||||
|
||||
work->pBufCur = next;
|
||||
byte = *cur;
|
||||
if (next >= end) {
|
||||
if (work->remaining != 0) {
|
||||
result = refillJpegBuffer(work);
|
||||
if (result < 0) {
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
} else {
|
||||
result = TMCC_ERROR_UNDERFLOW;
|
||||
break;
|
||||
}
|
||||
}
|
||||
result = 0;
|
||||
} while (0);
|
||||
highByte = (u32)byte << 8;
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
|
||||
{
|
||||
u8* tmp = work->pBufCur;
|
||||
do {
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
result = refillJpegBuffer(work);
|
||||
if (result < 0) {
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
} else {
|
||||
result = TMCC_ERROR_UNDERFLOW;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
cur = work->pBufCur;
|
||||
end = work->pBufEnd;
|
||||
cur = tmp;
|
||||
next = tmp + 1;
|
||||
}
|
||||
|
||||
work->pBufCur = next;
|
||||
byte_val = *cur;
|
||||
if (next < end) {
|
||||
goto o1;
|
||||
}
|
||||
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
goto o1;
|
||||
next = cur + 1;
|
||||
work->pBufCur = next;
|
||||
byte = *cur;
|
||||
if (next >= end) {
|
||||
if (work->remaining != 0) {
|
||||
result = refillJpegBuffer(work);
|
||||
if (result < 0) {
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
} else {
|
||||
result = TMCC_ERROR_UNDERFLOW;
|
||||
break;
|
||||
}
|
||||
}
|
||||
goto br;
|
||||
} else {
|
||||
r = TMCC_ERROR_UNDERFLOW;
|
||||
goto br;
|
||||
}
|
||||
|
||||
o1:
|
||||
r = 0;
|
||||
|
||||
br:
|
||||
byte_shifted = (u32)byte_val << 8;
|
||||
if (r >= 0) {
|
||||
goto p2;
|
||||
}
|
||||
return r;
|
||||
|
||||
p2:
|
||||
if (work->pBufCur < work->pBufEnd) {
|
||||
goto r2;
|
||||
}
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
if (r < 0)
|
||||
goto ez;
|
||||
else {
|
||||
// ...
|
||||
}
|
||||
} else {
|
||||
r = TMCC_ERROR_UNDERFLOW;
|
||||
goto ez;
|
||||
}
|
||||
|
||||
r2:
|
||||
cur = work->pBufCur;
|
||||
end = work->pBufEnd;
|
||||
next = cur + 1;
|
||||
work->pBufCur = next;
|
||||
byte_val = *cur;
|
||||
if (next < end) {
|
||||
goto o2;
|
||||
}
|
||||
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
if (r < 0)
|
||||
goto ez;
|
||||
else {
|
||||
// ...
|
||||
}
|
||||
} else {
|
||||
r = TMCC_ERROR_UNDERFLOW;
|
||||
goto ez;
|
||||
}
|
||||
|
||||
o2:
|
||||
r = 0;
|
||||
ez:
|
||||
*dst = byte_shifted + byte_val;
|
||||
return r < 0 ? r : 0;
|
||||
result = 0;
|
||||
} while (0);
|
||||
*dst = highByte + byte;
|
||||
return result < 0 ? result : 0;
|
||||
}
|
||||
|
||||
s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
|
||||
int r = 0;
|
||||
int result = 0;
|
||||
u32 i;
|
||||
u8 byte;
|
||||
u8* cur;
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
if (r < 0) {
|
||||
goto copy_byte;
|
||||
// MWCC needs the empty else branches to preserve refill branch direction.
|
||||
do {
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
result = refillJpegBuffer(work);
|
||||
if (result < 0) {
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
} else {
|
||||
// This else-branch is load-bearing...
|
||||
// Forces bge instead of blt.
|
||||
result = TMCC_ERROR_UNDERFLOW;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
r = TMCC_ERROR_UNDERFLOW;
|
||||
goto copy_byte;
|
||||
}
|
||||
}
|
||||
|
||||
cur = work->pBufCur;
|
||||
work->pBufCur += 1;
|
||||
byte = *cur;
|
||||
cur = work->pBufCur;
|
||||
work->pBufCur += 1;
|
||||
byte = *cur;
|
||||
|
||||
if (work->pBufCur < work->pBufEnd) {
|
||||
goto r0;
|
||||
}
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
goto r0;
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
result = refillJpegBuffer(work);
|
||||
if (result < 0) {
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
} else {
|
||||
result = TMCC_ERROR_UNDERFLOW;
|
||||
break;
|
||||
}
|
||||
}
|
||||
goto copy_byte;
|
||||
} else {
|
||||
r = TMCC_ERROR_UNDERFLOW;
|
||||
goto copy_byte;
|
||||
}
|
||||
|
||||
r0:
|
||||
r = 0;
|
||||
|
||||
copy_byte:
|
||||
result = 0;
|
||||
} while (0);
|
||||
*dst = byte;
|
||||
dst++;
|
||||
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (result < 0)
|
||||
return result;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -241,51 +225,41 @@ s32 TMCJPEGDEC_move_ptr(s32 offset, TMCCJPEGDecWork* work) {
|
||||
s32 avail;
|
||||
s32 r;
|
||||
|
||||
if (offset < 0) {
|
||||
goto ng;
|
||||
if (offset >= 0) {
|
||||
while (work->pBufEnd - work->pBufCur <= offset) {
|
||||
avail = work->pBufEnd - work->pBufCur;
|
||||
offset -= avail;
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
continue;
|
||||
}
|
||||
return r;
|
||||
} else {
|
||||
return TMCC_ERROR_UNDERFLOW;
|
||||
}
|
||||
}
|
||||
work->pBufCur += offset;
|
||||
if (work->pBufEnd > work->pBufCur) {
|
||||
goto done;
|
||||
}
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
goto done;
|
||||
}
|
||||
return r;
|
||||
} else {
|
||||
return TMCC_ERROR_UNDERFLOW;
|
||||
}
|
||||
} else {
|
||||
offset = -offset;
|
||||
if (work->pBufCur - work->pBufStart < offset) {
|
||||
return TMCC_ERROR_UNDERFLOW;
|
||||
}
|
||||
work->pBufCur -= offset;
|
||||
}
|
||||
goto lc;
|
||||
|
||||
lp:
|
||||
offset -= avail;
|
||||
if (work->remaining == 0) {
|
||||
goto er1;
|
||||
}
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
goto lc;
|
||||
}
|
||||
return r;
|
||||
er1:
|
||||
return TMCC_ERROR_UNDERFLOW;
|
||||
|
||||
lc:
|
||||
avail = work->pBufEnd - work->pBufCur;
|
||||
if (avail <= offset) {
|
||||
goto lp;
|
||||
}
|
||||
work->pBufCur += offset;
|
||||
if (work->pBufEnd > work->pBufCur) {
|
||||
goto ret0;
|
||||
}
|
||||
if (work->remaining == 0) {
|
||||
goto er2;
|
||||
}
|
||||
r = refillJpegBuffer(work);
|
||||
if (r >= 0) {
|
||||
goto ret0;
|
||||
}
|
||||
return r;
|
||||
er2:
|
||||
return TMCC_ERROR_UNDERFLOW;
|
||||
|
||||
ng:
|
||||
offset = -offset;
|
||||
if (work->pBufCur - work->pBufStart < offset) {
|
||||
return TMCC_ERROR_UNDERFLOW;
|
||||
}
|
||||
work->pBufCur -= offset;
|
||||
ret0:
|
||||
done:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -312,47 +286,45 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
|
||||
work->bitBuf = bitBuf;
|
||||
work->bitCount = bitCount;
|
||||
work->pBufCur = cur;
|
||||
goto ret;
|
||||
} else {
|
||||
do {
|
||||
if (work->pBufEnd <= work->pBufCur) {
|
||||
if (work->remaining == 0) {
|
||||
break;
|
||||
}
|
||||
r = refillJpegBufferAfterFF(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
u32 bb = work->bitBuf;
|
||||
u8* c = work->pBufCur;
|
||||
u8* next;
|
||||
u8 byte = *c;
|
||||
|
||||
next = c + 1;
|
||||
work->pBufCur = next;
|
||||
work->bitBuf = (bb << 8) + byte;
|
||||
work->bitCount += 8;
|
||||
if (byte == 0xFF) {
|
||||
work->pBufCur = next + 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (work->pBufEnd <= work->pBufCur) {
|
||||
if (work->remaining == 0) {
|
||||
break;
|
||||
}
|
||||
r = refillJpegBufferAfterFF(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
} while (work->bitCount <= 24);
|
||||
}
|
||||
|
||||
do {
|
||||
if (work->pBufEnd <= work->pBufCur) {
|
||||
if (work->remaining == 0) {
|
||||
break;
|
||||
}
|
||||
r = refillJpegBufferAfterFF(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
u32 bb = work->bitBuf;
|
||||
u8* c = work->pBufCur;
|
||||
u8* next;
|
||||
u8 byte = *c;
|
||||
|
||||
next = c + 1;
|
||||
work->pBufCur = next;
|
||||
work->bitBuf = (bb << 8) + byte;
|
||||
work->bitCount += 8;
|
||||
if (byte == 0xFF) {
|
||||
work->pBufCur = next + 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (work->pBufEnd <= work->pBufCur) {
|
||||
if (work->remaining == 0) {
|
||||
break;
|
||||
}
|
||||
r = refillJpegBufferAfterFF(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
} while (work->bitCount <= 24);
|
||||
|
||||
ret:
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ s32 TMCJPEGDEC_init_buff_thumbnail(TMCCJPEGDecWork* work, u8* dst, u8* src) {
|
||||
endAddress = (u32)buffer->pBufCur + endAddress;
|
||||
buffer->remaining = 0;
|
||||
buffer->pBufEnd = (u8*)endAddress;
|
||||
buffer->pBufMark = (u8*)((u32)endAddress - 0x22);
|
||||
buffer->pBufMark = (u8*)endAddress - 0x22;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -48,8 +48,11 @@ s32 TMCJPEGDEC_rewind_ptr(TMCCJPEGDecWork* work) {
|
||||
return r;
|
||||
}
|
||||
|
||||
if ((u8)bitBuf == 0xFF && (r = TMCJPEGDEC_move_ptr(-1, work), r < 0)) {
|
||||
return r;
|
||||
if ((u8)bitBuf == 0xFF) {
|
||||
r = TMCJPEGDEC_move_ptr(-1, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
bitBuf >>= 8;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user