Compare commits
1 Commits
docs/agent
...
cleanup/ip
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
18326569a4 |
164
AGENTS.md
164
AGENTS.md
@@ -164,8 +164,9 @@ 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
|
||||
to decompilation. Keep up to 75 live workers when the runtime allows it, while
|
||||
reserving capacity for fixer and validation workers. Fill completed slots with
|
||||
disjoint tasks. Never duplicate a source file or function
|
||||
range. Workers return changed paths, exact objdiff measurements, and validation
|
||||
results. Fuzzy-only results are not accepted.
|
||||
|
||||
@@ -245,12 +246,6 @@ and merge the PR, fast-forward `origin/main`, and publish progress. If a
|
||||
candidate fails validation, return it to its worker; do not fix the candidate
|
||||
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.
|
||||
@@ -325,159 +320,6 @@ 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
|
||||
|
||||
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.39% | 88.26% | 62.75% | 92.12% |
|
||||
| 99.38% | 88.00% | 62.37% | 92.07% |
|
||||
|
||||
units 923/1027 complete, functions 12245/12563 matched.
|
||||
units 920/1027 complete, functions 12226/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -688,13 +688,13 @@ src/scene/memoryCard/iplMemoryCard.cpp:
|
||||
.text start:0x813C9DCC end:0x813CC1FC
|
||||
.rodata start:0x81610368 end:0x81610480
|
||||
.data start:0x81651D30 end:0x81652640
|
||||
.sdata2 start:0x81694A68 end:0x81694A78
|
||||
.sdata2 start:0x81694A68 end:0x81694A80
|
||||
.sdata start:0x81696C78 end:0x81696CA0
|
||||
|
||||
src/scene/memoryCard/iplMemoryCardBase.cpp:
|
||||
.text start:0x813CC1FC end:0x813CD034
|
||||
.data start:0x81652640 end:0x816526D0
|
||||
.sdata2 start:0x81694A78 end:0x81694A88
|
||||
.sdata2 start:0x81694A80 end:0x81694A88
|
||||
|
||||
src/scene/memoryCard/iplMemoryCardManager.cpp:
|
||||
.text start:0x813CD034 end:0x813CE548
|
||||
@@ -3551,12 +3551,12 @@ libs/RVL_SDK/src/bte/l2c_csm.c:
|
||||
|
||||
libs/RVL_SDK/src/bte/l2c_link.c:
|
||||
.text start:0x815AC630 end:0x815AD7BC
|
||||
.data start:0x8168E930 end:0x8168EBA0
|
||||
.data start:0x8168E930 end:0x8168EB68
|
||||
|
||||
libs/RVL_SDK/src/bte/l2c_main.c:
|
||||
.bss start:0x811725E0 end:0x81172DC8
|
||||
.text start:0x815AD7BC end:0x815AE7EC
|
||||
.data start:0x8168EBA0 end:0x8168EEA0
|
||||
.data start:0x8168EB68 end:0x8168EEA0
|
||||
|
||||
libs/RVL_SDK/src/bte/l2c_utils.c:
|
||||
.text start:0x815AE7EC end:0x815B06B0
|
||||
|
||||
@@ -22275,8 +22275,8 @@ lbl_81697394 = .sdata:0x81697394; // type:object size:0x4 data:wstring
|
||||
lbl_81697398 = .sdata:0x81697398; // type:object size:0x4
|
||||
lbl_8169739C = .sdata:0x8169739C; // type:object size:0x4
|
||||
lbl_816973A0 = .sdata:0x816973A0; // type:object size:0x4 data:4byte
|
||||
scN_KOR = .sdata:0x816973A4; // type:object size:0x6 data:string
|
||||
scN_CHN = .sdata:0x816973AC; // type:object size:0x6 data:string
|
||||
lbl_816973A4 = .sdata:0x816973A4; // type:object size:0x6 data:string
|
||||
lbl_816973AC = .sdata:0x816973AC; // type:object size:0x6 data:string
|
||||
sbCompatibleFilterEnabled__Q39textinput9inputform13DeadKeyStream = .sdata:0x816973B2; // type:object size:0x1 data:byte
|
||||
mbHyphen__Q29textinput9inputform = .sdata:0x816973B3; // type:object size:0x1 data:byte
|
||||
lbl_816973B4 = .sdata:0x816973B4; // type:object size:0x4
|
||||
|
||||
@@ -689,7 +689,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("sound", [
|
||||
Object(Matching, "sound/iplSound.cpp"),
|
||||
Object(NonMatching, "sound/iplSound.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("iplwww", [
|
||||
@@ -869,7 +869,7 @@ config.libs = [
|
||||
),
|
||||
IPLSection("setting", [
|
||||
Object(NonMatching, "scene/setting/iplSetting.cpp"),
|
||||
Object(Matching, "scene/setting/iplSensitivity.cpp"),
|
||||
Object(NonMatching, "scene/setting/iplSensitivity.cpp"),
|
||||
Object(Matching, "scene/setting/iplNCDSetting.cpp"),
|
||||
Object(Matching, "scene/setting/iplParental.cpp"),
|
||||
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
|
||||
@@ -934,7 +934,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiLayout.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiLayoutGather.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiKoreanInput.cpp", extra_cflags=["-O4,p"]), # for 4.3K
|
||||
|
||||
@@ -20,8 +20,6 @@ namespace textinput {
|
||||
public:
|
||||
void NotifyEvent(u8 down, u8 code);
|
||||
void Update();
|
||||
bool HasCurrentKey(u32 slot) const { return (current & (1 << slot)) != 0; }
|
||||
bool HadPreviousKey(u32 slot) const { return (previous & (1 << slot)) != 0; }
|
||||
void UpdateModState_();
|
||||
void Clear() {
|
||||
held = 0;
|
||||
@@ -151,7 +149,6 @@ namespace textinput {
|
||||
void Update();
|
||||
|
||||
u32 GetModifierState() const;
|
||||
void SetCountry(u8 country);
|
||||
void SetModifierState(u32, u32);
|
||||
|
||||
#if defined(TI_CELLPHONE_HKB_KEYSET)
|
||||
|
||||
@@ -15,12 +15,12 @@ namespace textinput {
|
||||
#endif
|
||||
public:
|
||||
HWKeyboard(Manager *);
|
||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
inline ~HWKeyboard();
|
||||
#else
|
||||
~HWKeyboard();
|
||||
#endif
|
||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
void setLanguage(Destination destination, Language language);
|
||||
#endif
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace textinput {
|
||||
wchar_t convertWCCode(wchar_t code) const;
|
||||
#endif
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
#else
|
||||
virtual void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
@@ -46,10 +46,9 @@ namespace textinput {
|
||||
bool updateTappingShift_(input::HKBManager&);
|
||||
#endif
|
||||
void updateShift(input::HKBManager& hkbManager);
|
||||
bool controlKeyTriggeredHandler(input::HKBManager&);
|
||||
void controlKeyTriggeredHandler(input::HKBManager);
|
||||
|
||||
Manager *mgr() { return mpManager; }
|
||||
const Manager *mgr() const { return mpManager; }
|
||||
|
||||
Manager* mpManager; // 0x10
|
||||
u8 field_0x14; // 0x14
|
||||
|
||||
@@ -113,8 +113,6 @@ namespace textinput {
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void setTitleText(wchar_t* titleText);
|
||||
void initAspect();
|
||||
#elif defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
virtual void setTitleText(wchar_t* titleText);
|
||||
#else
|
||||
virtual void setTitleText(const wchar_t* titleText);
|
||||
#endif
|
||||
|
||||
@@ -309,8 +309,8 @@ namespace ipl {
|
||||
return mbArrowVisible[i];
|
||||
}
|
||||
|
||||
void setSuppressNewMailAnm(bool flag) {
|
||||
mbSuppressNewMailAnm = flag;
|
||||
void setUnk_0x105(bool flag) {
|
||||
unk_0x105 = flag;
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -354,7 +354,7 @@ namespace ipl {
|
||||
ANIM_MAX,
|
||||
};
|
||||
|
||||
int mAnimWait;
|
||||
int unk_0x54;
|
||||
|
||||
layout::Object* mpLayout; // 0x58
|
||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||
@@ -373,8 +373,8 @@ namespace ipl {
|
||||
|
||||
BOOL mbHovered[BTN_MAX]; // 0xD8
|
||||
|
||||
bool mbNewMailAnm;
|
||||
bool mbSuppressNewMailAnm;
|
||||
bool unk_0x104;
|
||||
bool unk_0x105;
|
||||
|
||||
utility::timer mTimer; // 0x108
|
||||
bool mbEnabled; // 0x110
|
||||
|
||||
@@ -95,9 +95,9 @@ namespace ipl {
|
||||
|
||||
public:
|
||||
nw4r::ut::List mDateList; // 0x84
|
||||
nw4r::ut::List mDrawList;
|
||||
nw4r::ut::List unk_0x90;
|
||||
bool mbScrolling; // 0x9C
|
||||
vBOOL mbSearchTaskRunning;
|
||||
vBOOL unk_0xA0;
|
||||
BOOL mbTaskCanceled; // 0xA4
|
||||
vBOOL mbBackToBoardAlt; // 0xA8
|
||||
bool mbAsian; // 0xAC
|
||||
|
||||
@@ -68,8 +68,8 @@ namespace ipl {
|
||||
vBOOL mbAppearMsg; // 0x0C
|
||||
|
||||
private:
|
||||
u32 mFocusState;
|
||||
int mPendingFocusCmd;
|
||||
u32 unk_0x10;
|
||||
int unk_0x14;
|
||||
layout::Object* mpLayout; // 0x18
|
||||
gui::PaneManager* mpGui; // 0x1C
|
||||
layout::PaneAnimator* mpCurrentPaneAnim; // 0x20
|
||||
@@ -77,7 +77,7 @@ namespace ipl {
|
||||
|
||||
public:
|
||||
utility::Date* mpDate; // 0x38
|
||||
u32 mPointCount;
|
||||
u32 unk_0x3C;
|
||||
|
||||
static const char* mscAnimPanes[ANIM_PANE_MAX];
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace ipl {
|
||||
};
|
||||
|
||||
virtual BOOL isResetAcceptable() const {
|
||||
return mbResetAcceptable;
|
||||
return unk_0x7D;
|
||||
}
|
||||
|
||||
virtual void prepare();
|
||||
@@ -108,7 +108,7 @@ namespace ipl {
|
||||
static const int mToFace_Duration = 20;
|
||||
|
||||
bool mbClosing; // 0x7C
|
||||
bool mbResetAcceptable;
|
||||
bool unk_0x7D;
|
||||
|
||||
wchar_t* mWCString; // 0x80
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace ipl {
|
||||
int stopBGM(int unk = 0);
|
||||
#endif
|
||||
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
void stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
int stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
void stopAllSound(int unk = 0);
|
||||
|
||||
int resetAllSound();
|
||||
@@ -99,7 +99,7 @@ namespace ipl {
|
||||
long clipGELT_S32(long value, long lo, long hi);
|
||||
|
||||
private:
|
||||
u32 unk_0x620[3];
|
||||
u32 unk_0x620[0x18];
|
||||
};
|
||||
|
||||
// use getSystem() and getBannerPlayer() instead
|
||||
|
||||
@@ -152,7 +152,7 @@ namespace ipl {
|
||||
BOOL is_working();
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
void requestCancel() { mbCancel = true; }
|
||||
void requestCancel() { unk_0x04 = true; }
|
||||
#endif
|
||||
|
||||
WIISaveBannerFile* get_cached_nand_save_banner(ESTitleId titleId);
|
||||
@@ -531,7 +531,7 @@ namespace ipl {
|
||||
static void wad_backup_progress_callback(u32 completed, u32 total, BOOL done);
|
||||
|
||||
Work* myWork; // 0x00
|
||||
bool mbCancel; // 0x04
|
||||
bool unk_0x04; // 0x04
|
||||
|
||||
static const char* c_banner_file_name;
|
||||
static const char* c_nocopy_folder_name;
|
||||
|
||||
@@ -64,8 +64,8 @@ typedef struct {
|
||||
u16 mcuYCount; // 0x10
|
||||
u16 mcuXCount2; // 0x12
|
||||
u32 unk_0x14;
|
||||
u8 remX; // 0x18
|
||||
u8 remY; // 0x19
|
||||
u8 unk_0x18;
|
||||
u8 unk_0x19;
|
||||
u8 compCount; // 0x1A
|
||||
u8 scanCompCount; // 0x1B
|
||||
u8 blockCount[4]; // 0x1C
|
||||
@@ -143,8 +143,8 @@ struct TMCCJPEGDecWork_t {
|
||||
u16 mcuYCount; // 0x1800
|
||||
u16 mcuXCount2; // 0x1802
|
||||
u32 unk_0x1804;
|
||||
u8 remX; // 0x1808
|
||||
u8 remY; // 0x1809
|
||||
u8 unk_0x1808;
|
||||
u8 unk_0x1809;
|
||||
u8 compCount; // 0x180A
|
||||
u8 scanCompCount; // 0x180B
|
||||
u8 blockCount[4]; // 0x180C
|
||||
|
||||
@@ -59,8 +59,8 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
|
||||
state->stepY = (state->scaleFactor + work->mcuXRem - 1) / state->scaleFactor;
|
||||
state->jpegWidth = ((s32)(work->frameWidth + state->scaleFactor) - 1) / state->scaleFactor;
|
||||
state->jpegHeight = (state->scaleFactor + work->frameHeight - 1) / state->scaleFactor;
|
||||
state->stepXExt = (state->scaleFactor + work->remX - 1) / state->scaleFactor;
|
||||
state->stepYExt = (state->scaleFactor + work->remY - 1) / state->scaleFactor;
|
||||
state->stepXExt = (state->scaleFactor + work->unk_0x1808 - 1) / state->scaleFactor;
|
||||
state->stepYExt = (state->scaleFactor + work->unk_0x1809 - 1) / state->scaleFactor;
|
||||
|
||||
state->dataSizeX = (state->stepXExt != 0) ? (state->maxX - 1) * state->stepX : (state->maxX + 1) * state->stepX;
|
||||
state->dataSizeY = (state->stepYExt != 0) ? (state->maxY - 1) * state->stepY : (state->maxY + 1) * state->stepY;
|
||||
|
||||
@@ -562,8 +562,8 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
|
||||
remX = p->frameWidth % p->mcuXCount;
|
||||
remY = p->frameHeight % p->mcuXRem;
|
||||
|
||||
p->remX = remX;
|
||||
p->remY = remY;
|
||||
p->unk_0x18 = remX;
|
||||
p->unk_0x19 = remY;
|
||||
|
||||
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
|
||||
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
|
||||
@@ -1919,8 +1919,8 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
|
||||
remX = fw - mcuCountX * mcuX;
|
||||
remY = fh - mcuCountY * mcuY;
|
||||
|
||||
work->remX = remX;
|
||||
work->remY = remY;
|
||||
work->unk_0x1808 = remX;
|
||||
work->unk_0x1809 = remY;
|
||||
|
||||
{
|
||||
u16 xr = (remX != 0) ? 1 : 0;
|
||||
|
||||
@@ -215,9 +215,9 @@ struct __zi8_work_data_s {
|
||||
ziU32 unk_0x0C;
|
||||
ziU32 unk_0x10;
|
||||
ziU16 unk_0x14;
|
||||
ziU8 cangjieEnabled; // 0x16
|
||||
ziU8 unk_0x16;
|
||||
ziU8 unk_0x17;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x18;
|
||||
ziU8 unk_0x19;
|
||||
ziU16 unk_0x1A;
|
||||
ziU8 unk_0x1C[3];
|
||||
@@ -258,7 +258,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x330[8];
|
||||
ziU32 unk_0x338;
|
||||
ziU8 unk_0x33C[0x1FC];
|
||||
ziU8 language; // 0x538
|
||||
ziU8 unk_0x538;
|
||||
ziU8 unk_0x539;
|
||||
ziU8 unk_0x53A[0x40];
|
||||
ziWChar unk_0x57A[0x641];
|
||||
|
||||
@@ -55,7 +55,7 @@ ziU32 Zi8GetTableData(ziU8 lang, ziU8 tableIdx, ziU8 memberId ZI_NEED_WORK) {
|
||||
if (langIdx-- != 0) {
|
||||
tableData = ZI_WORK->langEntries[langIdx].tableData;
|
||||
if ((lang == ZI8_LANG_ZH) && (tableData[3] >= 4) &&
|
||||
((ZI_WORK->subLanguage == 1) || (ZI_WORK->subLanguage == 0x80) || (ZI_WORK->subLanguage == 0x40))) {
|
||||
((ZI_WORK->unk_0x18 == 1) || (ZI_WORK->unk_0x18 == 0x80) || (ZI_WORK->unk_0x18 == 0x40))) {
|
||||
offset = ((tableData[0x8B] << 0x10) + (tableData[0x8C] << 8) + tableData[0x8D]);
|
||||
if (offset != 0) {
|
||||
tableData += offset;
|
||||
|
||||
@@ -430,7 +430,7 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
||||
if (getMode != 7 && getMode != 10 && getMode != 8 && getMode != 9) {
|
||||
Zi8PrepareMatch(request, &match, 0, work);
|
||||
} else {
|
||||
if (!((struct __zi8_work_data_s*)work)->cangjieEnabled || request->elementCount > 6) {
|
||||
if (!((struct __zi8_work_data_s*)work)->unk_0x16 || request->elementCount > 6) {
|
||||
resultFallback = 0;
|
||||
goto engine_finish;
|
||||
}
|
||||
@@ -1151,7 +1151,7 @@ context_word_lookup:
|
||||
if (ordinalIndex == 0xFFFF) goto context_results_done;
|
||||
record = records + ordinalIndex * 12;
|
||||
phoneticGroups = phraseTable + ((record[9] & 15) << 16 | (record[11] | record[10] << 8));
|
||||
if (((struct __zi8_work_data_s*)work)->cangjieEnabled) {
|
||||
if (((struct __zi8_work_data_s*)work)->unk_0x16) {
|
||||
switch (phoneticGroups[0] & 7) {
|
||||
case 2: phoneticGroups += 2; break;
|
||||
case 3: case 4: phoneticGroups += 3; break;
|
||||
@@ -1965,7 +1965,7 @@ component_retry:
|
||||
((ZiChineseWork*)work)->duplicateOrdinals[((ZiChineseWork*)work)->duplicateIndex] = ordinalIndex;
|
||||
relatedRecord = records + ordinalIndex * 12;
|
||||
phoneticGroups = phraseTable + ((relatedRecord[9] & 15) << 16 | (relatedRecord[11] | relatedRecord[10] << 8));
|
||||
if (((struct __zi8_work_data_s*)work)->cangjieEnabled) {
|
||||
if (((struct __zi8_work_data_s*)work)->unk_0x16) {
|
||||
switch (phoneticGroups[0] & 7) {
|
||||
case 2: phoneticGroups += 2; break;
|
||||
case 3: case 4: phoneticGroups += 3; break;
|
||||
|
||||
@@ -164,7 +164,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
parameters->letters = length;
|
||||
if ((parameters->getOptions & 0x80) == 0) {
|
||||
ZI_WORK->language = parameters->language;
|
||||
ZI_WORK->unk_0x538 = parameters->language;
|
||||
parameters->candidates[0] = 0xfff0;
|
||||
output = (ziWChar*)&ZI_WORK->unk_0x338;
|
||||
}
|
||||
@@ -490,8 +490,8 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
}
|
||||
}
|
||||
ZI_WORK->subLanguage = parameters->subLanguage;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
ZI_WORK->unk_0x18 = parameters->subLanguage;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
options->maxCount = ZI_WORK->unk_0x10;
|
||||
options->maxWordLength = ZI_WORK->unk_0x0A;
|
||||
ZI_WORK->unk_0x0A = -1;
|
||||
@@ -558,7 +558,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
}
|
||||
else if ((parameters->language == 1) &&
|
||||
((((parameters->getMode == 7 || (parameters->getMode == 8)) || (parameters->getMode == 10)) || (parameters->getMode == 9)))) {
|
||||
if (ZI_WORK->cangjieEnabled != '\0') {
|
||||
if (ZI_WORK->unk_0x16 != '\0') {
|
||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||
} else {
|
||||
error = 0x708;
|
||||
@@ -582,7 +582,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
}
|
||||
}
|
||||
else {
|
||||
ZI_WORK->language = parameters->language;
|
||||
ZI_WORK->unk_0x538 = parameters->language;
|
||||
if ((parameters->getOptions & 0x80) == 0) {
|
||||
saved.restoreCandidates = 1;
|
||||
saved.savedOptions = parameters->getOptions;
|
||||
|
||||
@@ -42,13 +42,13 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
return 0;
|
||||
}
|
||||
ZI_WORK->unk_0x1874 = 0x2D;
|
||||
ZI_WORK->language = 0;
|
||||
ZI_WORK->unk_0x538 = 0;
|
||||
ZI_WORK->unk_0x1C[3] = 0;
|
||||
ZI_WORK->unk_0x141A = 0x100;
|
||||
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
|
||||
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
|
||||
ZI_WORK->unk_0x17 = 5;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
||||
ZI_WORK->unk_0x1B28.bits.msb = 1;
|
||||
ZI_WORK->unk_0x1B2C.bits.msb = 1;
|
||||
zyFuzzy = ZI_WORK->unk_0x1B2C.word;
|
||||
|
||||
@@ -24,17 +24,17 @@ ziU8 Zi8GetZHCharSet(ziPtr workData) {
|
||||
return 0;
|
||||
}
|
||||
if (Zi8GetTableCount(1, 10, workData) != 0) {
|
||||
bak = ((struct __zi8_work_data_s*)workData)->subLanguage;
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = 1;
|
||||
bak = ((struct __zi8_work_data_s*)workData)->unk_0x18;
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = 1;
|
||||
addr = Zi8GetTableAddress(1, 10, workData);
|
||||
p = (ziU8*)addr;
|
||||
v0 = (ziU16)((ziU16)p[0] | ((ziU16)p[1] << 8));
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = 0;
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = 0;
|
||||
addr = Zi8GetTableAddress(1, 10, workData);
|
||||
p = (ziU8*)addr;
|
||||
v1 = (ziU16)((ziU16)p[2] | ((ziU16)p[3] << 8));
|
||||
v2 = (ziU16)((ziU16)p[4] | ((ziU16)p[5] << 8));
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = bak;
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = bak;
|
||||
if (v0 != 0) {
|
||||
if (v0 > 0x4E20) {
|
||||
charSet |= 8;
|
||||
|
||||
@@ -139,7 +139,7 @@ ziU32 Zi8SecMatchChar(ziPtr nodeAddress, ziU8* dictionaryAddress, ziMatchParam*
|
||||
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, ZI_WORK);
|
||||
data += ((ziU8*)nodeAddress)[0xB] + (((ziU8*)nodeAddress)[0xA] << 8) + ((((ziU8*)nodeAddress)[9] & 0xF) << 16);
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
switch (data[0] & 7) {
|
||||
case 2:
|
||||
data += 2;
|
||||
@@ -346,7 +346,7 @@ match_code:
|
||||
traversal.soundIndex = initialCode;
|
||||
}
|
||||
sound = (ziU8*)(tableAddress + ((node[9] & 0xF) * 0x10000 + (node[0xB] + node[0xA] * 0x100)));
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
switch (sound[0] & 7) {
|
||||
case 2:
|
||||
sound += 2;
|
||||
|
||||
@@ -37,7 +37,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
|
||||
p = (ziU8*)(table2 +
|
||||
(((e[9] & 0xF) << 16) |
|
||||
(e[0xB] | (e[0xA] << 8))));
|
||||
if (WORKP->cangjieEnabled != 0) {
|
||||
if (WORKP->unk_0x16 != 0) {
|
||||
switch (p[0] & 7) {
|
||||
case 2:
|
||||
p += 2;
|
||||
@@ -65,7 +65,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
|
||||
}
|
||||
}
|
||||
e = (ziU8*)table;
|
||||
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->subLanguage) {
|
||||
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->unk_0x18) {
|
||||
if ((ziU16)ch >= WORKP->unk_0x1B1C && (ziU16)ch <= WORKP->unk_0x1B1E) {
|
||||
i = (ziU16)(ch - WORKP->unk_0x1B1C);
|
||||
goto map;
|
||||
|
||||
@@ -103,10 +103,10 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
if (length == 1) return 1;
|
||||
count = --length;
|
||||
ordinals[count] |= 0x8000;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
switch (*data & 7) {
|
||||
case 2:
|
||||
offset = 2;
|
||||
|
||||
@@ -19,21 +19,21 @@ typedef struct CXUncompContextRL {
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u32 size; // 0x08
|
||||
u16 length; // 0x0C
|
||||
u8 flags; // 0x0E
|
||||
u8 hdrLen; // 0x0F
|
||||
u16 unk_0x0C; // 0x0C
|
||||
u8 unk_0x0e; // 0x0E
|
||||
u8 unk_0x0f; // 0x0F
|
||||
} CXUncompContextRL;
|
||||
|
||||
typedef struct CXUncompContextLZ {
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u32 size; // 0x08
|
||||
int length; // 0x0C
|
||||
u8 lengthBytesLeft; // 0x10
|
||||
u8 flags; // 0x11
|
||||
u8 flagsLeft; // 0x12
|
||||
u8 hdrLen; // 0x13
|
||||
u8 lzType; // 0x14
|
||||
int unk_0x0C; // 0x0C
|
||||
u8 unk_0x10; // 0x10
|
||||
u8 unk_0x11; // 0x11
|
||||
u8 unk_0x12; // 0x12
|
||||
u8 unk_0x13; // 0x13
|
||||
u8 unk_0x14; // 0x14
|
||||
u8 padding[3];
|
||||
} CXUncompContextLZ;
|
||||
|
||||
@@ -52,10 +52,10 @@ typedef struct CXUncompContextHuffman {
|
||||
u32 size; // 0x08
|
||||
CXHuffmanDecodeTableEntry* decodeTable; // 0x0C
|
||||
u32 bits; // 0x10
|
||||
u32 wordBuffer; // 0x14
|
||||
u32 unk_0x14; // 0x14
|
||||
s16 decodeTableSize; // 0x18
|
||||
u8 bitsLeft; // 0x1A
|
||||
u8 wordBits; // 0x1B
|
||||
u8 unk_0x1b; // 0x1B
|
||||
u8 depth; // 0x1C
|
||||
u8 hdrLen; // 0x1D
|
||||
u8 padding[2]; // 0x1E
|
||||
|
||||
@@ -67,17 +67,14 @@ BOOL AXFXChorusExpSettings(AXFX_CHORUS_EXP* fx) {
|
||||
OSRestoreInterrupts(enabled);
|
||||
return result;
|
||||
}
|
||||
static void __FreeDelayLine(AXFX_CHORUS_EXP* fx) {
|
||||
void AXFXChorusExpShutdown(AXFX_CHORUS_EXP* fx) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
u32 channel;
|
||||
fx->active |= 1;
|
||||
for (channel = 0; channel < 3; channel++) {
|
||||
if (fx->delay.line[channel] != NULL) __AXFXFree(fx->delay.line[channel]);
|
||||
fx->delay.line[channel] = NULL;
|
||||
}
|
||||
}
|
||||
void AXFXChorusExpShutdown(AXFX_CHORUS_EXP* fx) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
fx->active |= 1;
|
||||
__FreeDelayLine(fx);
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
|
||||
@@ -121,11 +118,10 @@ void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
|
||||
fx->history[0][history] = fx->delay.line[0][source];
|
||||
fx->history[1][history] = fx->delay.line[1][source];
|
||||
fx->history[2][history] = fx->delay.line[2][source];
|
||||
history++;
|
||||
history &= 3;
|
||||
history = (history + 1) & 3;
|
||||
source++;
|
||||
whole--;
|
||||
if (source >= fx->delay.size) source = 0;
|
||||
whole--;
|
||||
}
|
||||
fx->delay.lastPos = position & 0xFFFF0000;
|
||||
coefficients = __AXFXGetSrcCoef((fraction >> 9) & 0x7F);
|
||||
@@ -133,18 +129,14 @@ void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
|
||||
f32 filtered = 0.0f;
|
||||
f32 dry;
|
||||
filtered += coefficients[0] * fx->history[channel][history];
|
||||
history++;
|
||||
history &= 3;
|
||||
history = (history + 1) & 3;
|
||||
filtered += coefficients[1] * fx->history[channel][history];
|
||||
history++;
|
||||
history &= 3;
|
||||
history = (history + 1) & 3;
|
||||
filtered += coefficients[2] * fx->history[channel][history];
|
||||
history++;
|
||||
history &= 3;
|
||||
history = (history + 1) & 3;
|
||||
filtered += coefficients[3] * fx->history[channel][history];
|
||||
history++;
|
||||
history &= 3;
|
||||
if (fx->busIn != NULL) dry = *output[channel] + *input[channel]++;
|
||||
history = (history + 1) & 3;
|
||||
if (fx->busIn != NULL) dry = *input[channel]++ + *output[channel];
|
||||
else dry = *output[channel];
|
||||
fx->delay.line[channel][fx->delay.inPos] = dry + filtered * fx->feedback;
|
||||
*output[channel]++ = filtered * fx->outGain;
|
||||
|
||||
@@ -7,21 +7,21 @@ static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*,
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
|
||||
context->outData = data;
|
||||
context->outDataLen = 0;
|
||||
context->flags = 0;
|
||||
context->length = 0;
|
||||
context->hdrLen = 8;
|
||||
context->unk_0x0e = 0;
|
||||
context->unk_0x0C = 0;
|
||||
context->unk_0x0f = 8;
|
||||
context->size = 0;
|
||||
}
|
||||
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
|
||||
context->outData = data;
|
||||
context->outDataLen = 0;
|
||||
context->flags = 0;
|
||||
context->flagsLeft = 0;
|
||||
context->length = 0;
|
||||
context->lengthBytesLeft = 3;
|
||||
context->hdrLen = 8;
|
||||
context->lzType = 0;
|
||||
context->unk_0x11 = 0;
|
||||
context->unk_0x12 = 0;
|
||||
context->unk_0x0C = 0;
|
||||
context->unk_0x10 = 3;
|
||||
context->unk_0x13 = 8;
|
||||
context->unk_0x14 = 0;
|
||||
context->size = 0;
|
||||
}
|
||||
|
||||
@@ -31,8 +31,8 @@ void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data) {
|
||||
context->depth = 0;
|
||||
context->decodeTableSize = -1;
|
||||
context->decodeTable = context->decodeTableData;
|
||||
context->wordBuffer = 0;
|
||||
context->wordBits = 0;
|
||||
context->unk_0x14 = 0;
|
||||
context->unk_0x1b = 0;
|
||||
context->bits = 0;
|
||||
context->bitsLeft = 0;
|
||||
context->hdrLen = 8;
|
||||
@@ -42,9 +42,9 @@ void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data) {
|
||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size) {
|
||||
const u8* pSrc = src;
|
||||
|
||||
if (context->hdrLen) {
|
||||
if (context->unk_0x0f) {
|
||||
int a;
|
||||
if (context->hdrLen == 8) {
|
||||
if (context->unk_0x0f == 8) {
|
||||
if ((*pSrc & CX_COMPRESSION_TYPE_MASK) != CX_COMPRESSION_TYPE_RUN_LENGTH) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
@@ -54,22 +54,22 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
}
|
||||
}
|
||||
|
||||
a = CXiReadHeader(&context->hdrLen, &context->outDataLen, pSrc, size, context->size);
|
||||
a = CXiReadHeader(&context->unk_0x0f, &context->outDataLen, pSrc, size, context->size);
|
||||
|
||||
pSrc += a;
|
||||
size -= a;
|
||||
|
||||
if (!size) {
|
||||
return !context->hdrLen ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
return !context->unk_0x0f ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
}
|
||||
|
||||
while (context->outDataLen > 0) {
|
||||
if (!(context->flags & 0x80)) {
|
||||
while (context->length) {
|
||||
if (!(context->unk_0x0e & 0x80)) {
|
||||
while (context->unk_0x0C) {
|
||||
*context->outData++ = *pSrc++;
|
||||
|
||||
context->length--;
|
||||
context->unk_0x0C--;
|
||||
context->outDataLen--;
|
||||
size--;
|
||||
|
||||
@@ -77,14 +77,14 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
return context->outDataLen;
|
||||
}
|
||||
}
|
||||
} else if (context->length) {
|
||||
} else if (context->unk_0x0C) {
|
||||
u8 b = *pSrc++;
|
||||
size--;
|
||||
|
||||
while (context->length) {
|
||||
while (context->unk_0x0C) {
|
||||
*context->outData++ = b;
|
||||
|
||||
context->length--;
|
||||
context->unk_0x0C--;
|
||||
context->outDataLen--;
|
||||
}
|
||||
|
||||
@@ -93,22 +93,22 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
}
|
||||
}
|
||||
|
||||
context->flags = *pSrc++;
|
||||
context->unk_0x0e = *pSrc++;
|
||||
size--;
|
||||
context->length = context->flags & 0x7f;
|
||||
context->unk_0x0C = context->unk_0x0e & 0x7f;
|
||||
|
||||
if (context->flags & 0x80) {
|
||||
context->length += 3;
|
||||
if (context->unk_0x0e & 0x80) {
|
||||
context->unk_0x0C += 3;
|
||||
} else {
|
||||
context->length += 1;
|
||||
context->unk_0x0C += 1;
|
||||
}
|
||||
|
||||
if (context->length > context->outDataLen) {
|
||||
if (context->unk_0x0C > context->outDataLen) {
|
||||
if (!context->size) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_SIZE;
|
||||
}
|
||||
|
||||
context->length = context->outDataLen;
|
||||
context->unk_0x0C = context->outDataLen;
|
||||
}
|
||||
|
||||
if (size) {
|
||||
@@ -160,39 +160,39 @@ static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize,
|
||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size) {
|
||||
const u8* pSrc = src;
|
||||
|
||||
if (context->hdrLen) {
|
||||
if (context->unk_0x13) {
|
||||
int a;
|
||||
if (context->hdrLen == 8) {
|
||||
if (context->unk_0x13 == 8) {
|
||||
if ((*pSrc & CX_COMPRESSION_TYPE_MASK) != CX_COMPRESSION_TYPE_LZ) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
|
||||
context->lzType = *pSrc & 0x0F;
|
||||
context->unk_0x14 = *pSrc & 0x0F;
|
||||
|
||||
if (context->lzType != 0 && context->lzType != 1) {
|
||||
if (context->unk_0x14 != 0 && context->unk_0x14 != 1) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
}
|
||||
|
||||
a = CXiReadHeader(&context->hdrLen, &context->outDataLen, pSrc, size, context->size);
|
||||
a = CXiReadHeader(&context->unk_0x13, &context->outDataLen, pSrc, size, context->size);
|
||||
|
||||
pSrc += a;
|
||||
size -= a;
|
||||
|
||||
if (!size) {
|
||||
return !context->hdrLen ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
return !context->unk_0x13 ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
}
|
||||
|
||||
while (context->outDataLen > 0) {
|
||||
while (context->flagsLeft) {
|
||||
while (context->unk_0x12) {
|
||||
s32 a;
|
||||
|
||||
if (!size) {
|
||||
return context->outDataLen;
|
||||
}
|
||||
|
||||
if (!(context->flags & 0x80)) {
|
||||
if (!(context->unk_0x11 & 0x80)) {
|
||||
*context->outData++ = *pSrc++;
|
||||
context->outDataLen--;
|
||||
|
||||
@@ -201,38 +201,38 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
goto there;
|
||||
}
|
||||
|
||||
while (context->lengthBytesLeft) {
|
||||
context->lengthBytesLeft--;
|
||||
while (context->unk_0x10) {
|
||||
context->unk_0x10--;
|
||||
|
||||
if (!context->lzType) {
|
||||
context->length = *pSrc++;
|
||||
context->length += 0x30;
|
||||
context->lengthBytesLeft = 0;
|
||||
if (!context->unk_0x14) {
|
||||
context->unk_0x0C = *pSrc++;
|
||||
context->unk_0x0C += 0x30;
|
||||
context->unk_0x10 = 0;
|
||||
} else {
|
||||
switch (context->lengthBytesLeft) {
|
||||
switch (context->unk_0x10) {
|
||||
case 2: {
|
||||
context->length = *pSrc++;
|
||||
context->unk_0x0C = *pSrc++;
|
||||
|
||||
if (context->length >> 4 == 1) {
|
||||
context->length = (context->length & 0x0F) << 16;
|
||||
context->length += 0x1110;
|
||||
} else if (context->length >> 4 == 0) {
|
||||
context->length = (context->length & 0x0F) << 8;
|
||||
context->length += 0x110;
|
||||
context->lengthBytesLeft = 1;
|
||||
if (context->unk_0x0C >> 4 == 1) {
|
||||
context->unk_0x0C = (context->unk_0x0C & 0x0F) << 16;
|
||||
context->unk_0x0C += 0x1110;
|
||||
} else if (context->unk_0x0C >> 4 == 0) {
|
||||
context->unk_0x0C = (context->unk_0x0C & 0x0F) << 8;
|
||||
context->unk_0x0C += 0x110;
|
||||
context->unk_0x10 = 1;
|
||||
} else {
|
||||
context->length += 0x10;
|
||||
context->lengthBytesLeft = 0;
|
||||
context->unk_0x0C += 0x10;
|
||||
context->unk_0x10 = 0;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
context->length += *pSrc++ << 8;
|
||||
context->unk_0x0C += *pSrc++ << 8;
|
||||
break;
|
||||
}
|
||||
case 0: {
|
||||
context->length += *pSrc++;
|
||||
context->unk_0x0C += *pSrc++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -244,26 +244,26 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
}
|
||||
}
|
||||
|
||||
a = (context->length & 0x0F) << 8;
|
||||
context->length >>= 4;
|
||||
a = (context->unk_0x0C & 0x0F) << 8;
|
||||
context->unk_0x0C >>= 4;
|
||||
|
||||
a = (a | *pSrc++) + 1;
|
||||
size--;
|
||||
context->lengthBytesLeft = 3;
|
||||
context->unk_0x10 = 3;
|
||||
|
||||
if (context->length > context->outDataLen) {
|
||||
if (context->unk_0x0C > context->outDataLen) {
|
||||
if (!context->size) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_SIZE;
|
||||
}
|
||||
|
||||
context->length = context->outDataLen;
|
||||
context->unk_0x0C = context->outDataLen;
|
||||
}
|
||||
|
||||
while (context->length > 0) {
|
||||
while (context->unk_0x0C > 0) {
|
||||
*context->outData = context->outData[-a];
|
||||
context->outData++;
|
||||
context->outDataLen--;
|
||||
context->length--;
|
||||
context->unk_0x0C--;
|
||||
}
|
||||
|
||||
there:
|
||||
@@ -271,16 +271,16 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
goto out;
|
||||
}
|
||||
|
||||
context->flags <<= 1;
|
||||
context->flagsLeft--;
|
||||
context->unk_0x11 <<= 1;
|
||||
context->unk_0x12--;
|
||||
}
|
||||
|
||||
if (!size) {
|
||||
return context->outDataLen;
|
||||
}
|
||||
|
||||
context->flags = *pSrc++;
|
||||
context->flagsLeft = 8;
|
||||
context->unk_0x11 = *pSrc++;
|
||||
context->unk_0x12 = 8;
|
||||
size--;
|
||||
}
|
||||
|
||||
@@ -369,16 +369,16 @@ CXStreamingResult CXReadUncompHuffman(CXUncompContextHuffman* context, const voi
|
||||
continue;
|
||||
}
|
||||
|
||||
context->wordBuffer >>= context->depth;
|
||||
context->wordBuffer |= context->decodeTable->raw << (32 - context->depth);
|
||||
context->unk_0x14 >>= context->depth;
|
||||
context->unk_0x14 |= context->decodeTable->raw << (32 - context->depth);
|
||||
context->decodeTable = context->decodeTableData + 1;
|
||||
context->wordBits += context->depth;
|
||||
context->unk_0x1b += context->depth;
|
||||
|
||||
if (context->wordBits == 32) {
|
||||
*context->outData = CXiConvertEndian32_(context->wordBuffer);
|
||||
if (context->unk_0x1b == 32) {
|
||||
*context->outData = CXiConvertEndian32_(context->unk_0x14);
|
||||
context->outData++;
|
||||
context->outDataLen -= 4;
|
||||
context->wordBits = 0;
|
||||
context->unk_0x1b = 0;
|
||||
|
||||
if (context->outDataLen <= 0) {
|
||||
goto out;
|
||||
|
||||
@@ -141,7 +141,7 @@ pf_s32 pdm_part_get_start_sector(PDM_PARTITION* p_part) {
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
static inline pf_u32 partition_physical_sector(PDM_PARTITION* p_part, pf_u32 sector, pf_u32 bps) {
|
||||
pf_u32 pdm_part_chg_ltop(PDM_PARTITION* p_part, pf_u32 sector, pf_u32 bps) {
|
||||
pf_u16 media_bps;
|
||||
pf_u32 ratio;
|
||||
pf_u32 start;
|
||||
@@ -158,9 +158,6 @@ static inline pf_u32 partition_physical_sector(PDM_PARTITION* p_part, pf_u32 sec
|
||||
else if (ratio == 8) { start >>= 3; }
|
||||
return sector + start;
|
||||
}
|
||||
pf_u32 pdm_part_chg_ltop(PDM_PARTITION* p_part, pf_u32 sector, pf_u32 bps) NO_INLINE {
|
||||
return partition_physical_sector(p_part, sector, bps);
|
||||
}
|
||||
pf_s32 pdm_part_get_partition(PDM_DISK* p_disk, pf_u32 id, PDM_PARTITION** pp_part) {
|
||||
pf_s32 err;
|
||||
pf_u16 index;
|
||||
|
||||
@@ -322,8 +322,6 @@ pf_s32 PFCLUSTER_CombineFiles(PFCLUSTER_ENT_ITER* p_first_iter, PFCLUSTER_ENT_IT
|
||||
pf_u32 first_spare_clusters;
|
||||
pf_u32 second_spare_clusters;
|
||||
pf_u32 excess_clusters;
|
||||
pf_s32 second_allocated_clusters;
|
||||
pf_u32 capacity_clusters;
|
||||
pf_u32 first_end_cluster;
|
||||
pf_u32 first_spare_cluster;
|
||||
pf_u32 second_spare_cluster;
|
||||
@@ -372,10 +370,8 @@ pf_s32 PFCLUSTER_CombineFiles(PFCLUSTER_ENT_ITER* p_first_iter, PFCLUSTER_ENT_IT
|
||||
if (*p_second_iter->ffd.p_start_cluster != 0) {
|
||||
second_spare_clusters = p_second_iter->ffd.last_cluster.max_chain_index + 1 - second_used_clusters;
|
||||
}
|
||||
second_allocated_clusters = second_used_clusters + second_spare_clusters;
|
||||
capacity_clusters = -1U / cluster_size + 1;
|
||||
if (capacity_clusters < first_used_clusters + second_allocated_clusters) {
|
||||
excess_clusters = first_used_clusters + second_allocated_clusters - capacity_clusters;
|
||||
if (-1U / cluster_size + 1 < (second_used_clusters + second_spare_clusters) + first_used_clusters) {
|
||||
excess_clusters = (second_used_clusters + second_spare_clusters) + first_used_clusters - (-1U / cluster_size + 1);
|
||||
err = PFFAT_TraceClustersChain(&p_second_iter->ffd, second_spare_cluster,
|
||||
cluster_size * ((p_second_iter->ffd.last_cluster.max_chain_index + 1 - excess_clusters) - second_used_clusters),
|
||||
&end_cluster, &spare_cluster);
|
||||
@@ -538,7 +534,7 @@ pf_s32 PFCLUSTER_DivideFile(PFCLUSTER_ENT_ITER* p_source_iter, PFCLUSTER_ENT_ITE
|
||||
|
||||
pf_s32 PFCLUSTER_InsertCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
|
||||
pf_u32 cluster_index, pf_u32 num_clusters, pf_u32* p_inserted_clusters) {
|
||||
pf_u32 requested_size;
|
||||
pf_s32 err;
|
||||
pf_u32 previous_cluster;
|
||||
pf_u32 next_cluster;
|
||||
pf_u32 success_size;
|
||||
@@ -548,7 +544,7 @@ pf_s32 PFCLUSTER_InsertCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
|
||||
pf_u32 allocated_size;
|
||||
pf_u32 first_cluster;
|
||||
pf_u32 last_cluster;
|
||||
pf_s32 err;
|
||||
pf_u32 requested_size;
|
||||
pf_u32 file_clusters;
|
||||
pf_u32 remainder;
|
||||
pf_u32 extra_size;
|
||||
|
||||
@@ -784,21 +784,6 @@ s32 PFFAT_WriteClusterWithBuf(PFFAT_FFD* file, u32 cluster, u32 chainIndex,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static s32 PFFAT_WriteFATCopies(PF_VOLUME* volume, PF_CACHE_PAGE* page) {
|
||||
u16 fatIndex;
|
||||
u32 sector;
|
||||
s32 firstError;
|
||||
|
||||
sector = page->sector;
|
||||
firstError = 0;
|
||||
for (fatIndex = 0; fatIndex < volume->bpb.num_active_FATs; fatIndex++) {
|
||||
s32 error = PFSEC_WriteFAT(volume, page->p_buf, sector, 0, volume->bpb.bytes_per_sector);
|
||||
if (error != 0 && firstError == 0) firstError = error;
|
||||
sector += volume->bpb.sectors_per_FAT;
|
||||
}
|
||||
return firstError;
|
||||
}
|
||||
|
||||
s32 PFFAT_DoAllocateChain(PFFAT_FFD* file, u32 chainLength, u32 chainIndex,
|
||||
u32* firstAllocatedCluster,
|
||||
u32* lastAllocatedCluster, s32 resetClusters)
|
||||
@@ -808,10 +793,13 @@ s32 PFFAT_DoAllocateChain(PFFAT_FFD* file, u32 chainLength, u32 chainIndex,
|
||||
u32 firstFreeCluster;
|
||||
u32 lastFreeCluster;
|
||||
u32 cluster;
|
||||
u32 currentSector;
|
||||
PF_CACHE_PAGE* flushPage;
|
||||
u32 firstFlushError;
|
||||
s32 alreadyAllocated;
|
||||
s32 error;
|
||||
PF_CACHE_PAGE* page;
|
||||
u16 completedFATs;
|
||||
|
||||
volume = file->p_vol;
|
||||
eoc2 = fat_special_values[volume->bpb.fat_type].eoc2;
|
||||
@@ -885,7 +873,18 @@ s32 PFFAT_DoAllocateChain(PFFAT_FFD* file, u32 chainLength, u32 chainIndex,
|
||||
file->last_cluster.max_chain_index = chainIndex;
|
||||
*lastAllocatedCluster = lastFreeCluster;
|
||||
|
||||
firstFlushError = PFFAT_WriteFATCopies(volume, page);
|
||||
firstFlushError = 0;
|
||||
currentSector = page->sector;
|
||||
flushPage = page;
|
||||
for (completedFATs = 0; completedFATs < volume->bpb.num_active_FATs;
|
||||
completedFATs++) {
|
||||
error = PFSEC_WriteFAT(volume, flushPage->p_buf, currentSector, 0,
|
||||
volume->bpb.bytes_per_sector);
|
||||
if (error != 0 && firstFlushError == 0) {
|
||||
firstFlushError = error;
|
||||
}
|
||||
currentSector += volume->bpb.sectors_per_FAT;
|
||||
}
|
||||
if (firstFlushError != 0) {
|
||||
PFCACHE_FreeDataPage(volume, page);
|
||||
return firstFlushError;
|
||||
@@ -1232,6 +1231,8 @@ s32 PFFAT_GetSector(PFFAT_FFD* file, u32 fileSectorIndex, u32 mode,
|
||||
u32 fatType;
|
||||
u32 chainIndex;
|
||||
u32 cluster;
|
||||
u32 numRemainder;
|
||||
u32 numDivide;
|
||||
u32 numClusters;
|
||||
u32 numSectors;
|
||||
s32 error;
|
||||
@@ -1247,10 +1248,12 @@ s32 PFFAT_GetSector(PFFAT_FFD* file, u32 fileSectorIndex, u32 mode,
|
||||
}
|
||||
chainIndex = fileSectorIndex >> volume->bpb.log2_sectors_per_cluster;
|
||||
if (mode == 2) {
|
||||
numClusters = size / volume->bpb.bytes_per_sector;
|
||||
numSectors = numClusters + (size % volume->bpb.bytes_per_sector != 0);
|
||||
numClusters = numSectors / volume->bpb.sectors_per_cluster;
|
||||
numClusters = numClusters + (numSectors % volume->bpb.sectors_per_cluster != 0);
|
||||
numSectors = (size / volume->bpb.bytes_per_sector) +
|
||||
((size % volume->bpb.bytes_per_sector) != 0);
|
||||
numDivide = numSectors / volume->bpb.sectors_per_cluster;
|
||||
numRemainder =
|
||||
(numSectors % volume->bpb.sectors_per_cluster) != 0;
|
||||
numClusters = numRemainder + numDivide;
|
||||
error = PFFAT_GetClusterAllocated(file, chainIndex, numClusters,
|
||||
&cluster);
|
||||
if (error != 0) {
|
||||
@@ -1872,12 +1875,11 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
|
||||
error = 17;
|
||||
}
|
||||
if (error == 0) {
|
||||
PFFAT_FSINFO* info;
|
||||
u8* freeClusterBytes;
|
||||
info = (PFFAT_FSINFO*)page->p_buf;
|
||||
freeClusterBytes = info->num_free_clusters.bytes;
|
||||
if (((u32)freeClusterBytes & 3) != 0) {
|
||||
freeClusterBytes[0] = (u8)volume->num_free_clusters;
|
||||
if (((u32)&((PFFAT_FSINFO*)page->p_buf)
|
||||
->num_free_clusters.word &
|
||||
3) != 0) {
|
||||
((PFFAT_FSINFO*)page->p_buf)->num_free_clusters.bytes[0] =
|
||||
(u8)volume->num_free_clusters;
|
||||
((PFFAT_FSINFO*)page->p_buf)->num_free_clusters.bytes[1] =
|
||||
(u8)(volume->num_free_clusters >> 8);
|
||||
((PFFAT_FSINFO*)page->p_buf)->num_free_clusters.bytes[2] =
|
||||
@@ -1886,9 +1888,11 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
|
||||
(u8)(volume->num_free_clusters >> 24);
|
||||
} else {
|
||||
u32 freeClusters = volume->num_free_clusters;
|
||||
u32 upperBytes = (freeClusters << 24) | ((freeClusters << 8) & 0x00FF0000);
|
||||
u32 lowerBytes = (freeClusters >> 24) | ((freeClusters >> 8) & 0xFF00);
|
||||
info->num_free_clusters.word = upperBytes | lowerBytes;
|
||||
|
||||
((PFFAT_FSINFO*)page->p_buf)->num_free_clusters.word =
|
||||
(freeClusters << 24) |
|
||||
((freeClusters & 0xFF00) << 8) |
|
||||
((freeClusters >> 8) & 0xFF00) | (freeClusters >> 24);
|
||||
}
|
||||
error = PFSEC_WriteData(
|
||||
volume, page->p_buf, volume->bpb.fs_info_sector, 0,
|
||||
|
||||
@@ -54,9 +54,9 @@ typedef struct _CDBAttrBuf {
|
||||
|
||||
typedef struct _CDBAttr {
|
||||
CDBAttrBuf buf; // 0x00
|
||||
BOOL dirty; // 0x400
|
||||
BOOL wiiIdDirty; // 0x404
|
||||
BOOL wiiIdValid; // 0x408
|
||||
BOOL unk_0x400; // 0x400
|
||||
BOOL unk_0x404; // 0x404
|
||||
BOOL unk_0x408; // 0x408
|
||||
} CDBAttr;
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
@@ -97,7 +97,7 @@ typedef struct NHTTPResponseInfo
|
||||
s32 isSuccess;
|
||||
s32 isHeaderParse;
|
||||
s32 httpStatus;
|
||||
volatile u32 recvBufLen;
|
||||
u32 recvBufLen;
|
||||
char* allHeader_p;
|
||||
char* foundHeader_p;
|
||||
char* recvBuf_p;
|
||||
|
||||
@@ -44,8 +44,8 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#else
|
||||
NWC24UserId fromId; // 0x20
|
||||
#endif
|
||||
u32 date; // 0x28
|
||||
u32 receivedDate; // 0x2C
|
||||
u32 unk_0x28;
|
||||
u32 unk_0x2C;
|
||||
NWC24Data unk_0x30;
|
||||
NWC24Data unk_0x38;
|
||||
NWC24Data subject; // 0x40
|
||||
|
||||
@@ -55,9 +55,9 @@ CDBErr CDBAttrCheckAttrBuf(CDBAttr* attr) {
|
||||
|
||||
void CDBAttrInit(CDBAttr* attr) {
|
||||
memset(&attr->buf, 0, sizeof(CDBAttrBuf));
|
||||
attr->wiiIdValid = FALSE;
|
||||
attr->dirty = FALSE;
|
||||
attr->wiiIdDirty = FALSE;
|
||||
attr->unk_0x408 = FALSE;
|
||||
attr->unk_0x400 = FALSE;
|
||||
attr->unk_0x404 = FALSE;
|
||||
}
|
||||
|
||||
CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate) {
|
||||
@@ -89,7 +89,7 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
|
||||
|
||||
err = CDB_ERROR_OK;
|
||||
|
||||
attr->dirty = TRUE;
|
||||
attr->unk_0x400 = TRUE;
|
||||
}
|
||||
|
||||
if (err != CDB_ERROR_OK) {
|
||||
@@ -98,11 +98,11 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
|
||||
|
||||
attrLastModifiedDate = lastModifiedDate;
|
||||
memcpy(&attr->buf.lastModifiedDate, &attrLastModifiedDate, sizeof(u32));
|
||||
attr->dirty = TRUE;
|
||||
attr->unk_0x400 = TRUE;
|
||||
|
||||
attrModifiedCount = 0;
|
||||
memcpy(&attr->buf.cdbID.modifiedCount, &attrModifiedCount, sizeof(u32));
|
||||
attr->dirty = TRUE;
|
||||
attr->unk_0x400 = TRUE;
|
||||
|
||||
GenCDBIdNumber(&cdbNum);
|
||||
attrCdbIDNum = cdbNum;
|
||||
@@ -110,12 +110,12 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
|
||||
|
||||
attrWiiID = CDBGetWiiId();
|
||||
memcpy(&attr->buf.wiiId, &attrWiiID, sizeof(u64));
|
||||
attr->wiiIdValid = TRUE;
|
||||
attr->unk_0x408 = TRUE;
|
||||
|
||||
err = CDB_ERROR_OK;
|
||||
|
||||
attr->dirty = TRUE;
|
||||
attr->wiiIdDirty = TRUE;
|
||||
attr->unk_0x400 = TRUE;
|
||||
attr->unk_0x404 = TRUE;
|
||||
|
||||
return err;
|
||||
}
|
||||
@@ -123,7 +123,7 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
|
||||
CDBErr CDBAttrSetModifiedDate(CDBAttr* attr, u32 modifiedDate) {
|
||||
u32 value = modifiedDate;
|
||||
memcpy(&attr->buf.lastModifiedDate, &value, sizeof(u32));
|
||||
attr->dirty = TRUE;
|
||||
attr->unk_0x400 = TRUE;
|
||||
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -131,7 +131,7 @@ CDBErr CDBAttrSetModifiedDate(CDBAttr* attr, u32 modifiedDate) {
|
||||
CDBErr CDBAttrSetModifiedCount(CDBAttr* attr, u32 modifiedCount) {
|
||||
u32 value = modifiedCount;
|
||||
memcpy(&attr->buf.cdbID.modifiedCount, &value, sizeof(u32));
|
||||
attr->dirty = TRUE;
|
||||
attr->unk_0x400 = TRUE;
|
||||
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -151,7 +151,7 @@ CDBErr CDBAttrGetIDNumber(CDBAttr* attr, CDBId* cdbID) {
|
||||
CDBErr CDBAttrSetWiiId(CDBAttr* attr, u64 wiiId) {
|
||||
u64 value = wiiId;
|
||||
memcpy(&attr->buf.wiiId, &value, sizeof(u64));
|
||||
attr->wiiIdDirty = TRUE;
|
||||
attr->unk_0x404 = TRUE;
|
||||
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ CDBErr CDBRecordFileReadAttrBuf(CDBRecord* record) {
|
||||
return err;
|
||||
}
|
||||
|
||||
recordFile->attr.wiiIdValid = TRUE;
|
||||
recordFile->attr.unk_0x408 = TRUE;
|
||||
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -34,12 +34,12 @@ CDBErr CDBRecordFileWriteAttrBuf(CDBRecord* record) {
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
|
||||
if (recordFile->attr.dirty && !recordFile->attr.wiiIdDirty) {
|
||||
if (recordFile->attr.unk_0x400 && !recordFile->attr.unk_0x404) {
|
||||
err = CDBFWriteAttrOnlyLeadChunk(&recordFile->bridgeFile, &recordFile->attr, record->key.location);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
return err;
|
||||
}
|
||||
} else if (recordFile->attr.dirty || recordFile->attr.wiiIdDirty) {
|
||||
} else if (recordFile->attr.unk_0x400 || recordFile->attr.unk_0x404) {
|
||||
err = CDBFWriteAttr(&recordFile->bridgeFile, &recordFile->attr, record->key.location);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
return err;
|
||||
|
||||
@@ -127,14 +127,10 @@ s32 NHTTPi_RecvBuf(void* mutex, NHTTPRequestInfo* request, s32 socket, u32 offse
|
||||
}
|
||||
|
||||
s32 NHTTPi_RecvBufN(void* mutex, NHTTPRequestInfo* request, s32 socket, u32 offset, s32 length, s32 flags) {
|
||||
s32 available;
|
||||
NHTTPResponseInfo* response=request->response;
|
||||
void* buf;
|
||||
s32 available;
|
||||
if(response->recvBufLen<=offset) return -1003;
|
||||
available=response->recvBufLen;
|
||||
buf=response->recvBuf_p;
|
||||
available=available-offset;
|
||||
buf=(u8*)buf+offset;
|
||||
available=response->recvBufLen-offset;
|
||||
if(length>available) length=available;
|
||||
return NHTTPi_SocRecv(mutex,request,socket,buf,length,flags);
|
||||
return NHTTPi_SocRecv(mutex,request,socket,response->recvBuf_p+offset,length,flags);
|
||||
}
|
||||
|
||||
@@ -67,11 +67,10 @@ s32 NHTTPi_strToHex(const char* string, s32 length) {
|
||||
s32 value;
|
||||
BOOL started;
|
||||
if(length>8) return -1;
|
||||
if((length==8) & (*string>'7')) return -1;
|
||||
if((length==8) & (*string>='7')) return -1;
|
||||
value=0; started=FALSE;
|
||||
for(; length>0; --length,++string) {
|
||||
u8 rawCharacter = *(const u8*)string;
|
||||
s8 character = LowerCase((s8)rawCharacter);
|
||||
s8 character=LowerCase(*string);
|
||||
if(character>='0' && character<='9') { value=(value<<4)+character-'0'; started=TRUE; }
|
||||
else if(character>='a' && character<='f') { value=(value<<4)+character-'a'+10; started=TRUE; }
|
||||
else {
|
||||
@@ -104,9 +103,9 @@ s32 NHTTPi_strToInt(const char* string, s32 length) {
|
||||
|
||||
s32 NHTTPi_intToStr(char* destination, u32 value) {
|
||||
u32 scales[9]={1000000000,100000000,10000000,1000000,100000,10000,1000,100,10};
|
||||
char* output;
|
||||
int digit;
|
||||
BOOL started;
|
||||
int digit;
|
||||
char* output;
|
||||
s32 length;
|
||||
output = destination;
|
||||
length = 0;
|
||||
@@ -136,22 +135,18 @@ s32 NHTTPi_compareToken(const char* left, const char* right) {
|
||||
}
|
||||
|
||||
s32 NHTTPi_strtonum(const char* string, u32 length) {
|
||||
int character;
|
||||
s32 value;
|
||||
int digits;
|
||||
digits = 0;
|
||||
value = 0;
|
||||
for (; length != 0; --length, ++string) {
|
||||
u8 rawCharacter = *(const u8*)string;
|
||||
character = (s8)rawCharacter;
|
||||
if (character == ' ') continue;
|
||||
if ((character >= '0') & (character <= '9')) {
|
||||
value = value * 10 + character - '0';
|
||||
int digits=0;
|
||||
s32 value=0;
|
||||
while(length--) {
|
||||
int character=*string++;
|
||||
if(character==' ') continue;
|
||||
if((character>='0') & (character<='9')) {
|
||||
value=value*10+character-'0';
|
||||
++digits;
|
||||
if (digits > 9) return -1;
|
||||
if(digits>9) return -1;
|
||||
}
|
||||
}
|
||||
if (digits == 0) return -1;
|
||||
if(digits==0) return -1;
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
@@ -783,7 +783,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
|
||||
continue;
|
||||
}
|
||||
if (msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
|
||||
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->date) {
|
||||
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->unk_0x28) {
|
||||
duplicateId = entry->msgId;
|
||||
duplicateOffset = offset;
|
||||
continue;
|
||||
@@ -962,8 +962,8 @@ static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entr
|
||||
entry->crc = msg->unk_0x1C;
|
||||
entry->fromIdHigh = msg->fromIdHigh;
|
||||
entry->fromIdLow = msg->fromIdLow;
|
||||
entry->date = msg->date;
|
||||
entry->receivedDate = msg->receivedDate;
|
||||
entry->date = msg->unk_0x28;
|
||||
entry->receivedDate = msg->unk_0x2C;
|
||||
entry->numTo = msg->numTo;
|
||||
entry->numAttached = msg->numAttached;
|
||||
entry->groupId = msg->groupId;
|
||||
@@ -1009,8 +1009,8 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->unk_0x1C = entry->crc;
|
||||
msg->fromIdHigh = entry->fromIdHigh;
|
||||
msg->fromIdLow = entry->fromIdLow;
|
||||
msg->date = entry->date;
|
||||
msg->receivedDate = entry->receivedDate;
|
||||
msg->unk_0x28 = entry->date;
|
||||
msg->unk_0x2C = entry->receivedDate;
|
||||
msg->numTo = entry->numTo;
|
||||
msg->numAttached = entry->numAttached;
|
||||
msg->groupId = entry->groupId;
|
||||
|
||||
@@ -158,7 +158,7 @@ static inline NWC24Err WriteMessageIdField(NWC24MsgObjPrivate* msg) {
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_strcpy(buffer, "Message-Id: <");
|
||||
Mail_memset(idText, 0, 32);
|
||||
Mail_sprintf(idText, "%05X%08X%08X%08X", msg->msgId, (u32)(myId >> 32), (u32)myId, msg->date);
|
||||
Mail_sprintf(idText, "%05X%08X%08X%08X", msg->msgId, (u32)(myId >> 32), (u32)myId, msg->unk_0x28);
|
||||
Mail_strcat(buffer, idText);
|
||||
Mail_strcat(buffer, domain);
|
||||
Mail_strcat(buffer, ">\r\n");
|
||||
@@ -312,7 +312,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteExtraFields(msg));
|
||||
Mail_memset(MultiPartDivider, 0, 40);
|
||||
Mail_sprintf(MultiPartDivider, "Boundary-NWC24-%08X%05X", msg->date, msg->msgId);
|
||||
Mail_sprintf(MultiPartDivider, "Boundary-NWC24-%08X%05X", msg->unk_0x28, msg->msgId);
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_strcpy(buffer, "MIME-Version: 1.0\r\n");
|
||||
@@ -654,9 +654,9 @@ static NWC24Err WriteDateField(NWC24MsgObjPrivate* msg) {
|
||||
date.sec = calendar.sec;
|
||||
if (date.month > 12)
|
||||
return NWC24_ERR_FORMAT;
|
||||
NWC24iDateToMinutes(&msg->date, &date);
|
||||
NWC24iDateToMinutes(&msg->unk_0x28, &date);
|
||||
if (msg->type & 0x1000000)
|
||||
NWC24iMinutesToDate(&date, msg->receivedDate);
|
||||
NWC24iMinutesToDate(&date, msg->unk_0x2C);
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_sprintf(buffer, "Date: %02d %s %d %02d:%02d:%02d -0000\r\n", date.day, months[date.month - 1], date.year, date.hour, date.min, date.sec);
|
||||
|
||||
@@ -46,9 +46,9 @@ NWC24Err NWC24InitMsgObj(NWC24MsgObj* msg, NWC24MsgType type) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
|
||||
msgObj->date = 0;
|
||||
msgObj->unk_0x28 = 0;
|
||||
msgObj->type |= 0x200000;
|
||||
msgObj->receivedDate = 0;
|
||||
msgObj->unk_0x2C = 0;
|
||||
|
||||
NWC24GetMyUserId(&msgObj->fromId);
|
||||
msgObj->numTo = 0;
|
||||
@@ -477,7 +477,7 @@ NWC24Err NWC24GetMsgFromId(const NWC24MsgObj* msg, NWC24UserId* fromId) {
|
||||
NWC24Err NWC24GetMsgDate(const NWC24MsgObj* msg, OSCalendarTime* msgDate) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
|
||||
NWC24iMinutesToOSCalendarTime(msgDate, msgObj->date);
|
||||
NWC24iMinutesToOSCalendarTime(msgDate, msgObj->unk_0x28);
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -30,23 +30,14 @@ typedef struct InetRequest {
|
||||
union { struct { int family; u8 address[16]; } reply; u8 replyBlock[32]; };
|
||||
char text[1];
|
||||
} InetRequest;
|
||||
typedef struct RecvPayload {
|
||||
union { struct { int socket; int flags; } command; u8 commandBlock[32]; };
|
||||
SOSockAddr address;
|
||||
} RecvPayload;
|
||||
typedef struct RecvRequest {
|
||||
IOSIoVector vectors[4];
|
||||
RecvPayload payload;
|
||||
} RecvRequest;
|
||||
typedef struct SendCommand {
|
||||
int socket;
|
||||
int flags;
|
||||
int hasAddress;
|
||||
union { struct { int socket; int flags; } command; u8 commandBlock[32]; };
|
||||
SOSockAddr address;
|
||||
} SendCommand;
|
||||
} RecvRequest;
|
||||
typedef struct SendRequest {
|
||||
IOSIoVector vectors[4];
|
||||
SendCommand command;
|
||||
struct { int socket; int flags; int hasAddress; SOSockAddr address; } command;
|
||||
} SendRequest;
|
||||
|
||||
static int RecvFrom(const char*, int, void*, int, int, SOSockAddr*);
|
||||
@@ -267,17 +258,11 @@ char* SOInetNtoA(SOInAddr address) {
|
||||
|
||||
int SOInetPtoN(int family, const char* text, void* address) {
|
||||
s32 rm;
|
||||
int temporary;
|
||||
int size;
|
||||
int result;
|
||||
int bytes;
|
||||
int temporary,result,size,bytes;
|
||||
InetRequest* request;
|
||||
if((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
|
||||
bytes=0;
|
||||
switch (family) {
|
||||
case 2: bytes=4; break;
|
||||
default: break;
|
||||
}
|
||||
if(family==2) bytes=4;
|
||||
if(!bytes) result=-5;
|
||||
else if(!text) result=-28;
|
||||
else {
|
||||
@@ -304,14 +289,11 @@ u32 SOHtoNl(u32 value) { return value; }
|
||||
u16 SOHtoNs(u16 value) { return value; }
|
||||
|
||||
static inline int DirectBuffer(const void* data, int length) {
|
||||
BOOL accessible;
|
||||
BOOL direct;
|
||||
BOOL aligned;
|
||||
direct=FALSE;
|
||||
aligned=FALSE;
|
||||
BOOL direct=FALSE;
|
||||
BOOL aligned=FALSE;
|
||||
if(((u32)data&31)==0 && length%32==0) aligned=TRUE;
|
||||
if(aligned) {
|
||||
accessible=TRUE;
|
||||
BOOL accessible=TRUE;
|
||||
if(SOiIsBufferAddrCheck()) {
|
||||
BOOL inMemory=FALSE;
|
||||
if(((u32)data&0x1fffffff)>=0x10000000 && ((u32)data&0x1fffffff)<0x18000000) inMemory=TRUE;
|
||||
@@ -324,12 +306,10 @@ static inline int DirectBuffer(const void* data, int length) {
|
||||
|
||||
static int RecvFrom(const char* name, int socket, void* data, int length, int flags, SOSockAddr* address) {
|
||||
s32 rm;
|
||||
void* buffer;
|
||||
int size;
|
||||
int result,size;
|
||||
BOOL direct;
|
||||
RecvRequest* request;
|
||||
RecvPayload* payload;
|
||||
int result;
|
||||
void* buffer;
|
||||
SOSockAddr* reply;
|
||||
if(length>32768) length=32768;
|
||||
if((result=SOiPrepare(name,&rm))==0) {
|
||||
@@ -338,16 +318,15 @@ static int RecvFrom(const char* name, int socket, void* data, int length, int fl
|
||||
else {
|
||||
direct=TRUE;
|
||||
if(length && !DirectBuffer(data,length)) direct=FALSE;
|
||||
size=((address == NULL ? 0 : address->len)+95)&~31;
|
||||
size=((address ? address->len : 0)+95)&~31;
|
||||
request=SOiAlloc(12,size);
|
||||
if(direct == FALSE) buffer=SOiAlloc(13,(length+31)&~31);
|
||||
if(!direct) buffer=SOiAlloc(13,(length+31)&~31);
|
||||
else buffer=data;
|
||||
if(!request || !buffer) result=-49;
|
||||
else {
|
||||
payload=&request->payload;
|
||||
payload->command.socket=socket; payload->command.flags=flags;
|
||||
reply=&payload->address;
|
||||
request->vectors[0].base=(u8*)payload; request->vectors[0].length=8;
|
||||
request->command.socket=socket; request->command.flags=flags;
|
||||
reply=&request->address;
|
||||
request->vectors[0].base=(u8*)&request->command; request->vectors[0].length=8;
|
||||
request->vectors[1].base=buffer; request->vectors[1].length=length;
|
||||
if(!address) {
|
||||
request->vectors[2].base=NULL; request->vectors[2].length=0;
|
||||
@@ -357,12 +336,14 @@ static int RecvFrom(const char* name, int socket, void* data, int length, int fl
|
||||
request->vectors[2].base=(u8*)reply; request->vectors[2].length=address->len;
|
||||
result=IOS_Ioctlv(rm,12,1,2,request->vectors);
|
||||
if(result>=0) {
|
||||
memcpy(address,reply,address->len > reply->len ? reply->len : address->len);
|
||||
u32 bytes=address->len;
|
||||
if(bytes>reply->len) bytes=reply->len;
|
||||
memcpy(address,reply,bytes);
|
||||
}
|
||||
}
|
||||
if(result>=0 && direct == FALSE) memcpy(data,buffer,length);
|
||||
if(result>=0 && !direct) memcpy(data,buffer,length);
|
||||
}
|
||||
if(direct == FALSE) SOiFree(13,buffer,(length+31)&~31);
|
||||
if(!direct) SOiFree(13,buffer,(length+31)&~31);
|
||||
SOiFree(12,request,size);
|
||||
}
|
||||
result=SOiConclude(name,result);
|
||||
@@ -371,12 +352,11 @@ static int RecvFrom(const char* name, int socket, void* data, int length, int fl
|
||||
}
|
||||
|
||||
static int SendTo(const char* name, int socket, const void* data, int length, int flags, const SOSockAddr* address) {
|
||||
void* buffer;
|
||||
BOOL direct;
|
||||
int result;
|
||||
s32 rm;
|
||||
BOOL direct;
|
||||
void* buffer;
|
||||
SendRequest* request;
|
||||
SendCommand* command;
|
||||
if((result=SOiPrepare(name,&rm))==0) {
|
||||
if(address && (address->len>8 || address->len<8)) result=-28;
|
||||
else if(length<0 || (length>0 && !data)) result=-28;
|
||||
@@ -384,23 +364,22 @@ static int SendTo(const char* name, int socket, const void* data, int length, in
|
||||
direct=TRUE;
|
||||
if(length && !DirectBuffer(data,length)) direct=FALSE;
|
||||
request=SOiAlloc(12,96);
|
||||
if(direct == FALSE) buffer=SOiAlloc(14,(length+31)&~31);
|
||||
if(!direct) buffer=SOiAlloc(14,(length+31)&~31);
|
||||
else buffer=(void*)data;
|
||||
if(!request || !buffer) result=-49;
|
||||
else {
|
||||
command = &request->command;
|
||||
command->socket=socket; command->flags=flags;
|
||||
if(!address) command->hasAddress=0;
|
||||
request->command.socket=socket; request->command.flags=flags;
|
||||
if(!address) request->command.hasAddress=0;
|
||||
else {
|
||||
command->hasAddress=1;
|
||||
memcpy(&command->address,address,address->len);
|
||||
request->command.hasAddress=1;
|
||||
memcpy(&request->command.address,address,address->len);
|
||||
}
|
||||
if(direct == FALSE) memcpy(buffer,data,length);
|
||||
if(!direct) memcpy(buffer,data,length);
|
||||
request->vectors[0].base=buffer; request->vectors[0].length=length;
|
||||
request->vectors[1].base=(u8*)command; request->vectors[1].length=40;
|
||||
request->vectors[1].base=(u8*)&request->command; request->vectors[1].length=40;
|
||||
result=IOS_Ioctlv(rm,13,2,0,request->vectors);
|
||||
}
|
||||
if(direct == FALSE) SOiFree(14,buffer,(length+31)&~31);
|
||||
if(!direct) SOiFree(14,buffer,(length+31)&~31);
|
||||
SOiFree(12,request,96);
|
||||
}
|
||||
result=SOiConclude(name,result);
|
||||
|
||||
@@ -338,8 +338,8 @@ void HKBManager::KeyState_::Update() {
|
||||
held = heldKeys;
|
||||
for (index = 0; index < 8; index++) {
|
||||
bit = 1 << index;
|
||||
if (HasCurrentKey(index)) {
|
||||
if (!HadPreviousKey(index) || previousKeys[index] != currentKeys[index]) {
|
||||
if ((current & bit) != 0) {
|
||||
if ((previous & bit) == 0 || previousKeys[index] != currentKeys[index]) {
|
||||
triggered |= bit;
|
||||
}
|
||||
}
|
||||
@@ -347,8 +347,8 @@ void HKBManager::KeyState_::Update() {
|
||||
released = 0;
|
||||
for (index = 0; index < 8; index++) {
|
||||
bit = 1 << index;
|
||||
if (HadPreviousKey(index)) {
|
||||
if (!HasCurrentKey(index) || previousKeys[index] != currentKeys[index]) {
|
||||
if ((previous & bit) != 0) {
|
||||
if ((current & bit) == 0 || previousKeys[index] != currentKeys[index]) {
|
||||
released |= bit;
|
||||
}
|
||||
}
|
||||
@@ -356,7 +356,7 @@ void HKBManager::KeyState_::Update() {
|
||||
repeated = 0;
|
||||
for (index = 0; index < 8; index++) {
|
||||
bit = 1 << index;
|
||||
if (HasCurrentKey(index)) {
|
||||
if ((current & bit) != 0) {
|
||||
if ((triggered & bit) != 0) {
|
||||
repeatDelay[index] = 30;
|
||||
repeated |= bit;
|
||||
@@ -371,14 +371,17 @@ void HKBManager::KeyState_::Update() {
|
||||
}
|
||||
|
||||
void HKBManager::KeyState_::UpdateModState_() {
|
||||
u32 oldModifiers;
|
||||
u32 index;
|
||||
oldModifiers = modifiers;
|
||||
u32 oldModifiers = modifiers;
|
||||
modifiers = oldModifiers & 0xffffffd0;
|
||||
index = 0;
|
||||
for (; index < 8; index++) {
|
||||
if (HasCurrentKey(static_cast<u8>(index))) {
|
||||
u8 code = currentKeys[static_cast<u8>(index)];
|
||||
u32 keySet;
|
||||
u8 slot;
|
||||
keySet = current;
|
||||
slot = index;
|
||||
if ((keySet & (1 << slot)) != 0) {
|
||||
u8 code = currentKeys[slot];
|
||||
if (code == 0xe5 || code == 0xe1) {
|
||||
modifiers |= 2;
|
||||
} else if (code == 0xe4 || code == 0xe0) {
|
||||
@@ -497,23 +500,7 @@ u32 HKBManager::KeySet::GetVCode() const {
|
||||
}
|
||||
|
||||
u32 HKBManager::KeySet::IsValid() const {
|
||||
s8 keyIndex;
|
||||
u32 keyDevice;
|
||||
const HKBManager* owner;
|
||||
|
||||
owner = manager;
|
||||
if (!owner) return false;
|
||||
keyIndex = index;
|
||||
if (keyIndex < 0 || keyIndex >= 8) return false;
|
||||
keyDevice = device;
|
||||
if (keyDevice >= 2) return false;
|
||||
switch (type) {
|
||||
case 0: return (owner->states[keyDevice].held & (1 << keyIndex)) != 0;
|
||||
case 1: return (owner->states[keyDevice].triggered & (1 << keyIndex)) != 0;
|
||||
case 2: return (owner->states[keyDevice].released & (1 << keyIndex)) != 0;
|
||||
case 3: return (owner->states[keyDevice].repeated & (1 << keyIndex)) != 0;
|
||||
}
|
||||
return false;
|
||||
return CheckValidity();
|
||||
}
|
||||
|
||||
HKBManager::KeySet HKBManager::KeySet::GetNext() const {
|
||||
|
||||
@@ -5,14 +5,245 @@
|
||||
#include "keyboard/tiHKBManager.h"
|
||||
#include "keyboard/tiLayoutGather.h"
|
||||
|
||||
extern "C" void SetCountry__Q39textinput5input10HKBManagerFUc();
|
||||
extern "C" textinput::input::HKBManager sInstance__Q39textinput5input10HKBManager;
|
||||
extern "C" void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw();
|
||||
extern "C" bool updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
||||
extern "C" void __dt__Q49textinput8keyboard5hwkey10HWKeyboardFv();
|
||||
extern "C" void create__Q29textinput4BaseFP12MEMAllocator();
|
||||
extern "C" void init__Q49textinput8keyboard5hwkey10HWKeyboardFv();
|
||||
extern "C" void setCommandReceiver__Q29textinput13CommandSenderFPQ29textinput15CommandReceiver();
|
||||
extern "C" void sendCommand__Q29textinput13CommandSenderFUlPv();
|
||||
extern "C" void updateFromReceiver__Q29textinput13CommandSenderFUlPv();
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
typedef void (*KeyboardDataFunction)();
|
||||
extern "C" KeyboardDataFunction const scHwKeyboardConvertWCCodeJumpTable[0x3f] = {
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000158),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001d8),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001c0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000170),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x0000017c),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000134),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001a0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000140),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000188),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000194),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000148),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000150),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000164),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001b8),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001ac)
|
||||
};
|
||||
extern "C" KeyboardDataFunction const __vt__Q49textinput8keyboard5hwkey10HWKeyboard[9] = {
|
||||
NULL,
|
||||
NULL,
|
||||
__dt__Q49textinput8keyboard5hwkey10HWKeyboardFv,
|
||||
create__Q29textinput4BaseFP12MEMAllocator,
|
||||
init__Q49textinput8keyboard5hwkey10HWKeyboardFv,
|
||||
setCommandReceiver__Q29textinput13CommandSenderFPQ29textinput15CommandReceiver,
|
||||
sendCommand__Q29textinput13CommandSenderFUlPv,
|
||||
updateFromReceiver__Q29textinput13CommandSenderFUlPv,
|
||||
reinterpret_cast<KeyboardDataFunction>(updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager)
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
namespace textinput {
|
||||
|
||||
namespace keyboard {
|
||||
|
||||
namespace hwkey {
|
||||
HWKeyboard::HWKeyboard(Manager* manager) : mpManager(manager), field_0x14(0), field_0x15(0), field_0x16(0) {
|
||||
extern "C" void GetTriggeredKeySet__Q39textinput5input10HKBManagerCFv();
|
||||
extern "C" void IsValid__Q49textinput5input10HKBManager6KeySetCFv();
|
||||
extern "C" void GetKey__Q49textinput5input10HKBManager6KeySetCFv();
|
||||
extern "C" void GetNext__Q49textinput5input10HKBManager6KeySetCFv();
|
||||
extern "C" void GetModifierState__Q39textinput5input10HKBManagerCFv();
|
||||
extern "C" bool updateRepeatKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
||||
extern "C" bool updateTriggerKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
||||
extern "C" bool updateTappingShift___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
||||
extern "C" void updateShift__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
||||
extern "C" asm bool updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager() {
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
mflr r0
|
||||
stw r0, 0x44(r1)
|
||||
stw r31, 0x3c(r1)
|
||||
mr r31, r4
|
||||
stw r30, 0x38(r1)
|
||||
mr r30, r3
|
||||
lwz r3, 0x10(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x84(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0xdc(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne updateInput_HWKeyboard_L1
|
||||
mr r3, r31
|
||||
bl GetModifierState__Q39textinput5input10HKBManagerCFv
|
||||
rlwinm. r0, r3, 0, 0x1d, 0x1d
|
||||
bne updateInput_HWKeyboard_L2
|
||||
li r0, 0
|
||||
b updateInput_HWKeyboard_L3
|
||||
updateInput_HWKeyboard_L2:
|
||||
li r5, 0
|
||||
li r0, -1
|
||||
stw r5, 8(r1)
|
||||
mr r4, r31
|
||||
addi r3, r1, 0x14
|
||||
stb r5, 0xc(r1)
|
||||
stb r0, 0xd(r1)
|
||||
stb r5, 0xe(r1)
|
||||
sth r5, 0x10(r1)
|
||||
bl GetTriggeredKeySet__Q39textinput5input10HKBManagerCFv
|
||||
lwz r6, 0x14(r1)
|
||||
lbz r5, 0x18(r1)
|
||||
lbz r4, 0x19(r1)
|
||||
lbz r3, 0x1a(r1)
|
||||
lhz r0, 0x1c(r1)
|
||||
stw r6, 8(r1)
|
||||
stb r5, 0xc(r1)
|
||||
stb r4, 0xd(r1)
|
||||
stb r3, 0xe(r1)
|
||||
sth r0, 0x10(r1)
|
||||
b updateInput_HWKeyboard_L4
|
||||
updateInput_HWKeyboard_L5:
|
||||
addi r3, r1, 8
|
||||
bl GetKey__Q49textinput5input10HKBManager6KeySetCFv
|
||||
clrlwi r0, r3, 0x18
|
||||
cmpwi r0, 0x2b
|
||||
bge updateInput_HWKeyboard_L6
|
||||
cmpwi r0, 0x28
|
||||
beq updateInput_HWKeyboard_L7
|
||||
bge updateInput_HWKeyboard_L8
|
||||
b updateInput_HWKeyboard_L9
|
||||
updateInput_HWKeyboard_L6:
|
||||
cmpwi r0, 0x58
|
||||
beq updateInput_HWKeyboard_L7
|
||||
b updateInput_HWKeyboard_L9
|
||||
updateInput_HWKeyboard_L7:
|
||||
lwz r3, 0x10(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x94(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0xa0(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
li r0, 1
|
||||
b updateInput_HWKeyboard_L3
|
||||
updateInput_HWKeyboard_L8:
|
||||
lwz r3, 0x10(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x94(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0xa4(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
li r0, 1
|
||||
b updateInput_HWKeyboard_L3
|
||||
updateInput_HWKeyboard_L9:
|
||||
addi r3, r1, 0x20
|
||||
addi r4, r1, 8
|
||||
bl GetNext__Q49textinput5input10HKBManager6KeySetCFv
|
||||
lwz r6, 0x20(r1)
|
||||
lbz r5, 0x24(r1)
|
||||
lbz r4, 0x25(r1)
|
||||
lbz r3, 0x26(r1)
|
||||
lhz r0, 0x28(r1)
|
||||
stw r6, 8(r1)
|
||||
stb r5, 0xc(r1)
|
||||
stb r4, 0xd(r1)
|
||||
stb r3, 0xe(r1)
|
||||
sth r0, 0x10(r1)
|
||||
updateInput_HWKeyboard_L4:
|
||||
addi r3, r1, 8
|
||||
bl IsValid__Q49textinput5input10HKBManager6KeySetCFv
|
||||
cmpwi r3, 0
|
||||
bne updateInput_HWKeyboard_L5
|
||||
li r0, 0
|
||||
updateInput_HWKeyboard_L3:
|
||||
cmpwi r0, 0
|
||||
bne updateInput_HWKeyboard_L1
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
bl updateRepeatKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager
|
||||
cmpwi r3, 0
|
||||
bne updateInput_HWKeyboard_L1
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
bl updateTriggerKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager
|
||||
cmpwi r3, 0
|
||||
bne updateInput_HWKeyboard_L1
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
bl updateTappingShift___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager
|
||||
updateInput_HWKeyboard_L1:
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
bl updateShift__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager
|
||||
lwz r31, 0x3c(r1)
|
||||
li r3, 0
|
||||
lwz r30, 0x38(r1)
|
||||
lwz r0, 0x44(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x40
|
||||
blr
|
||||
}
|
||||
|
||||
struct NavigationCommand { u32 command; u32 modifiers; };
|
||||
@@ -26,78 +257,6 @@ struct KeyInputData {
|
||||
u32 data;
|
||||
};
|
||||
extern const u8 controlKeys[];
|
||||
void HWKeyboard::init() {
|
||||
LayoutGather::Singleton::getInstance().setHWPressedShift(false);
|
||||
|
||||
u32 state = input::HKBManager::getInstance().GetModifierState();
|
||||
input::HKBManager::getInstance().SetModifierState(state | 0x100, 0x700);
|
||||
field_0x15 = 0;
|
||||
field_0x16 = 0;
|
||||
}
|
||||
|
||||
void HWKeyboard::updateShift(input::HKBManager& hkbManager) {
|
||||
LayoutGather &gather = LayoutGather::Singleton::getInstance();
|
||||
|
||||
u32 state = hkbManager.GetModifierState();
|
||||
|
||||
if (!mgr()->getToolBar()->isQwerty() && !mgr()->getToolBar()->isEnableKeytopChange()) {
|
||||
return;
|
||||
}
|
||||
|
||||
bool previousShift = gather.isHoldingShift();
|
||||
|
||||
if (state & 0x2) {
|
||||
gather.setHWPressedShift(true);
|
||||
if (!previousShift) {
|
||||
mgr()->getPCKeyboard()->onPressedShift(true);
|
||||
}
|
||||
} else {
|
||||
gather.setHWPressedShift(false);
|
||||
if (previousShift) {
|
||||
if (!gather.isHoldingShift()) {
|
||||
mgr()->getPCKeyboard()->onReleasedShift();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline bool HWKeyboard::controlKeyTriggeredHandler(input::HKBManager& hkbManager) {
|
||||
if ((hkbManager.GetModifierState() & 4) == 0) {
|
||||
return false;
|
||||
}
|
||||
input::HKBManager::KeySet currentKeySet;
|
||||
currentKeySet = hkbManager.GetTriggeredKeySet();
|
||||
while (currentKeySet.IsValid()) {
|
||||
switch (currentKeySet.GetKey()) {
|
||||
case 0x28:
|
||||
case 0x58: {
|
||||
mgr()->getToolBar()->onOK();
|
||||
return true;
|
||||
}
|
||||
case 0x29:
|
||||
case 0x2A: {
|
||||
mgr()->getToolBar()->onCancel();
|
||||
return true;
|
||||
}
|
||||
default: {
|
||||
currentKeySet = currentKeySet.GetNext();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool HWKeyboard::updateInput(input::HKBManager& hkbManager) {
|
||||
if (!static_cast<signwindow::LayoutByNW4R*>(mgr()->getSignKeyboard())->isActive() &&
|
||||
!controlKeyTriggeredHandler(hkbManager) &&
|
||||
!updateRepeatKey_(hkbManager) && !updateTriggerKey_(hkbManager)) {
|
||||
updateTappingShift_(hkbManager);
|
||||
}
|
||||
updateShift(hkbManager);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool HWKeyboard::updateRepeatKey_(input::HKBManager& hkbManager) {
|
||||
u32 modifierState = hkbManager.GetModifierState();
|
||||
input::HKBManager::KeySet currentKeySet;
|
||||
@@ -416,12 +575,50 @@ extern const u8 controlKeys[];
|
||||
return false;
|
||||
}
|
||||
|
||||
HWKeyboard::HWKeyboard(Manager* manager) : mpManager(manager), field_0x14(0), field_0x15(0), field_0x16(0) {
|
||||
}
|
||||
|
||||
void HWKeyboard::init() {
|
||||
LayoutGather::Singleton::getInstance().setHWPressedShift(false);
|
||||
|
||||
u32 state = input::HKBManager::getInstance().GetModifierState();
|
||||
input::HKBManager::getInstance().SetModifierState(state | 0x100, 0x700);
|
||||
field_0x15 = 0;
|
||||
field_0x16 = 0;
|
||||
}
|
||||
|
||||
void HWKeyboard::updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) {
|
||||
if (trig != 0) {
|
||||
field_0x14 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void HWKeyboard::updateShift(input::HKBManager& hkbManager) {
|
||||
LayoutGather &gather = LayoutGather::Singleton::getInstance();
|
||||
|
||||
u32 state = hkbManager.GetModifierState();
|
||||
|
||||
if (!mgr()->getToolBar()->isQwerty() && !mgr()->getToolBar()->isEnableKeytopChange()) {
|
||||
return;
|
||||
}
|
||||
|
||||
bool previousShift = gather.isHoldingShift();
|
||||
|
||||
if (state & 0x2) {
|
||||
gather.setHWPressedShift(true);
|
||||
if (!previousShift) {
|
||||
mgr()->getPCKeyboard()->onPressedShift(true);
|
||||
}
|
||||
} else {
|
||||
gather.setHWPressedShift(false);
|
||||
if (previousShift) {
|
||||
if (!gather.isHoldingShift()) {
|
||||
mgr()->getPCKeyboard()->onReleasedShift();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
|
||||
@@ -440,47 +637,183 @@ const u8 controlKeys[] = {
|
||||
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
|
||||
wchar_t HWKeyboard::convertWCCode(wchar_t code) const {
|
||||
if (mgr()->getToolBar()->isQwerty() && mgr()->getPCKeyboard()->getTranslateMode()) {
|
||||
if (mgr()->getLanguage() == JP) {
|
||||
switch (code) {
|
||||
case 0x2C: { return 0x3001; }
|
||||
case 0x2E: { return 0x3002; }
|
||||
case 0x2D: { return 0x30FC; }
|
||||
case 0x5B: { return 0x300C; }
|
||||
case 0x5D: { return 0x300D; }
|
||||
}
|
||||
} else if (mgr()->getLanguage() == CN) {
|
||||
switch (code) {
|
||||
case 0x2C: { return 0xFF0C; }
|
||||
case 0x2E: { return 0x3002; }
|
||||
case 0x3C: { return 0x300A; }
|
||||
case 0x3E: { return 0x300B; }
|
||||
case 0x21: { return 0xFF01; }
|
||||
case 0x3F: { return 0xFF1F; }
|
||||
case 0x28: { return 0xFF08; }
|
||||
case 0x29: { return 0xFF09; }
|
||||
case 0x3A: { return 0xFF1A; }
|
||||
case 0x3B: { return 0xFF1B; }
|
||||
case 0x2D: { return 0xFF0D; }
|
||||
case 0x5F: { return 0xFF3F; }
|
||||
case 0x5C: { return 0x3001; }
|
||||
case 0x27: { if (field_0x15) { return 0x2019; } return 0x2018; }
|
||||
case 0x22: { if (field_0x16) { return 0x201D; } return 0x201C; }
|
||||
}
|
||||
}
|
||||
}
|
||||
return code;
|
||||
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
|
||||
nofralloc
|
||||
cmpwi r4, 2
|
||||
bne setLanguage_L1
|
||||
lis r4, scCountryMap_EU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, scCountryMap_EU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
setLanguage_L1:
|
||||
lis r4, scCountryMap_NonEU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, scCountryMap_NonEU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
}
|
||||
|
||||
|
||||
|
||||
void HWKeyboard::setLanguage(Destination destination, Language language) {
|
||||
if (destination == DST_EU) {
|
||||
input::HKBManager::getInstance().SetCountry(scCountryMap_EU[language]);
|
||||
} else {
|
||||
input::HKBManager::getInstance().SetCountry(scCountryMap_NonEU[language]);
|
||||
}
|
||||
extern "C" asm void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r4
|
||||
stw r30, 8(r1)
|
||||
mr r30, r3
|
||||
lwz r3, 0x10(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x98(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x10(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq convertWCCode_HWKeyboard_L1
|
||||
lwz r3, 0x10(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x78(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x58(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq convertWCCode_HWKeyboard_L1
|
||||
lwz r3, 0x10(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x34(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne convertWCCode_HWKeyboard_L2
|
||||
cmpwi r31, 0x5b
|
||||
beq convertWCCode_HWKeyboard_L3
|
||||
bge convertWCCode_HWKeyboard_L4
|
||||
cmpwi r31, 0x2d
|
||||
beq convertWCCode_HWKeyboard_L5
|
||||
bge convertWCCode_HWKeyboard_L6
|
||||
cmpwi r31, 0x2c
|
||||
bge convertWCCode_HWKeyboard_L7
|
||||
b convertWCCode_HWKeyboard_L1
|
||||
convertWCCode_HWKeyboard_L6:
|
||||
cmpwi r31, 0x2f
|
||||
bge convertWCCode_HWKeyboard_L1
|
||||
b convertWCCode_HWKeyboard_L8
|
||||
convertWCCode_HWKeyboard_L4:
|
||||
cmpwi r31, 0x5d
|
||||
beq convertWCCode_HWKeyboard_L9
|
||||
b convertWCCode_HWKeyboard_L1
|
||||
convertWCCode_HWKeyboard_L7:
|
||||
li r3, 0x3001
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L8:
|
||||
li r3, 0x3002
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L5:
|
||||
li r3, 0x30fc
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L3:
|
||||
li r3, 0x300c
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L9:
|
||||
li r3, 0x300d
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L2:
|
||||
lwz r3, 0x10(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x34(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 8
|
||||
bne convertWCCode_HWKeyboard_L1
|
||||
addi r0, r31, -0x21
|
||||
cmplwi r0, 0x3e
|
||||
bgt convertWCCode_HWKeyboard_L1
|
||||
lis r3, scHwKeyboardConvertWCCodeJumpTable@ha
|
||||
slwi r0, r0, 2
|
||||
addi r3, r3, scHwKeyboardConvertWCCodeJumpTable@l
|
||||
lwzx r3, r3, r0
|
||||
mtctr r3
|
||||
bctr
|
||||
convertWCCode_HWKeyboard_L11:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xf4
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L12:
|
||||
li r3, 0x3002
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L13:
|
||||
li r3, 0x300a
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L14:
|
||||
li r3, 0x300b
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L15:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xff
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L16:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xe1
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L17:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xf8
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L18:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xf7
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L19:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xe6
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L20:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xe5
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L21:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xf3
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L22:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xc1
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L23:
|
||||
li r3, 0x3001
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L24:
|
||||
lbz r3, 0x15(r30)
|
||||
neg r0, r3
|
||||
or r0, r0, r3
|
||||
srwi r3, r0, 0x1f
|
||||
addi r3, r3, 0x2018
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L25:
|
||||
lbz r3, 0x16(r30)
|
||||
neg r0, r3
|
||||
or r0, r0, r3
|
||||
srwi r3, r0, 0x1f
|
||||
addi r3, r3, 0x201c
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L1:
|
||||
mr r3, r31
|
||||
convertWCCode_HWKeyboard_L10:
|
||||
lwz r0, 0x14(r1)
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 8(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
}
|
||||
} // namespace hwkey
|
||||
|
||||
|
||||
@@ -151,8 +151,8 @@ extern "C" const char scT_title_textKOR[];
|
||||
extern "C" const char scN_separateBarCHN[];
|
||||
extern "C" const char scT_2l_TextBoxCHN[];
|
||||
extern "C" const char scT_title_textCHN[];
|
||||
extern "C" const char scN_KOR[];
|
||||
extern "C" const char scN_CHN[];
|
||||
extern "C" const char lbl_816973A4[];
|
||||
extern "C" const char lbl_816973AC[];
|
||||
#pragma pop
|
||||
extern "C" const f32 scInputFormZeroF;
|
||||
extern "C" void _savegpr_20();
|
||||
|
||||
@@ -1499,18 +1499,14 @@ namespace textinput {
|
||||
return mKeyState.getWCCode(paneName);
|
||||
}
|
||||
|
||||
inline u32 FindControlKey(const Base::KeyState& state, char* paneName) {
|
||||
u32 Base::getControlKey(char* paneName) {
|
||||
for (u16 i = 0; i < 23; i++) {
|
||||
if (util::strcmp(state.data->controls[i].paneName, paneName))
|
||||
return state.data->controls[i].key;
|
||||
if (util::strcmp(mKeyState.data->controls[i].paneName, paneName))
|
||||
return mKeyState.data->controls[i].key;
|
||||
}
|
||||
return 27;
|
||||
}
|
||||
|
||||
u32 Base::getControlKey(char* paneName) {
|
||||
return FindControlKey(mKeyState, paneName);
|
||||
}
|
||||
|
||||
void Base::changeABCInputMode(InputMode mode) {
|
||||
switch (mode) {
|
||||
case IM_Direct:
|
||||
|
||||
@@ -185,7 +185,7 @@ namespace ipl {
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
Button::Button(EGG::Heap* heap) : Base(heap), mAnimWait(0), mOptOutBtn(), mSdMenuBtn(), mbNewMailAnm(false), mbSuppressNewMailAnm(false), mReservedCmd() {
|
||||
Button::Button(EGG::Heap* heap) : Base(heap), unk_0x54(0), mOptOutBtn(), mSdMenuBtn(), unk_0x104(false), unk_0x105(false), mReservedCmd() {
|
||||
for (int i = 0; i < ARROW_BTN_MAX; i++) {
|
||||
mbArrowVisible[i] = true;
|
||||
}
|
||||
@@ -293,7 +293,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Button::calc() {
|
||||
switch (mAnimWait) {
|
||||
switch (unk_0x54) {
|
||||
case 0: {
|
||||
if (mReservedCmd.get_current_index() != 0) {
|
||||
Command popped = mReservedCmd.get_popped_item();
|
||||
@@ -312,7 +312,7 @@ namespace ipl {
|
||||
if (!mpButtonAnim[ANIM_SCENE_CHANGE]->isPlaying() && !mpButtonAnim[ANIM_CALENDAR_EXIT]->isPlaying() &&
|
||||
!mpButtonAnim[ANIM_COMMON_BUTTON]->isPlaying() && !mpButtonAnim[ANIM_TRASH_DELETE]->isPlaying() &&
|
||||
!mOptOutBtn.mpLayout->isPlaying()) {
|
||||
mAnimWait = 0;
|
||||
unk_0x54 = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -335,7 +335,7 @@ namespace ipl {
|
||||
mpBalloons[i]->calc();
|
||||
}
|
||||
|
||||
if (mbNewMailAnm && !mbSuppressNewMailAnm && mTimer()) {
|
||||
if (unk_0x104 && !unk_0x105 && mTimer()) {
|
||||
startNewMailAnm_();
|
||||
}
|
||||
}
|
||||
@@ -457,7 +457,7 @@ namespace ipl {
|
||||
|
||||
bool Button::isActive() const {
|
||||
bool result = false;
|
||||
if (isSceneCreated() && mAnimWait != 1) {
|
||||
if (isSceneCreated() && unk_0x54 != 1) {
|
||||
result = true;
|
||||
}
|
||||
return result;
|
||||
@@ -668,7 +668,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
mAnimWait = 1;
|
||||
unk_0x54 = 1;
|
||||
}
|
||||
|
||||
void Button::initArrowAppearance(int arrowType, bool bAppear) {
|
||||
@@ -752,8 +752,8 @@ namespace ipl {
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMinFrame(scLoopAnmFrame.start);
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMaxFrame(scLoopAnmFrame.end);
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setSpeed(1.0f);
|
||||
mbNewMailAnm = true;
|
||||
if (!mbSuppressNewMailAnm) {
|
||||
unk_0x104 = true;
|
||||
if (!unk_0x105) {
|
||||
startNewMailAnm_();
|
||||
}
|
||||
}
|
||||
@@ -773,7 +773,7 @@ namespace ipl {
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMaxFrame(1.0f);
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setSpeed(0.0f);
|
||||
mpButtonAnim[ANIM_BOARD_BBS_NEW]->play();
|
||||
mbNewMailAnm = false;
|
||||
unk_0x104 = false;
|
||||
}
|
||||
|
||||
void Button::enableBtn() {
|
||||
|
||||
@@ -236,10 +236,10 @@ namespace ipl {
|
||||
|
||||
Calendar::Calendar(EGG::Heap* heap)
|
||||
: FaderSceneBase(heap), ButtonEventHandlerBase(), mState(STATE_NORMAL), mPrevState(STATE_NORMAL), mpLayout(NULL), mpLayoutFile(NULL),
|
||||
mpGroupAnim(NULL), mpInitAnim(NULL), mpBoardDate(NULL), mpSelectDate(NULL), mbScrolling(false), mbSearchTaskRunning(FALSE), mbTaskCanceled(FALSE),
|
||||
mpGroupAnim(NULL), mpInitAnim(NULL), mpBoardDate(NULL), mpSelectDate(NULL), mbScrolling(false), unk_0xA0(FALSE), mbTaskCanceled(FALSE),
|
||||
mbBackToBoardAlt(FALSE) {
|
||||
nw4r::ut::List_Init(&mDateList, offsetof(Date, mNode1));
|
||||
nw4r::ut::List_Init(&mDrawList, offsetof(Date, mNode2));
|
||||
nw4r::ut::List_Init(&unk_0x90, offsetof(Date, mNode2));
|
||||
|
||||
mbAsian = System::getRegion() == SC_PRODUCT_AREA_JPN || (u32)System::getRegion() == SC_PRODUCT_AREA_KOR ||
|
||||
(u32)System::getRegion() == SC_PRODUCT_AREA_CHN;
|
||||
@@ -262,7 +262,7 @@ namespace ipl {
|
||||
for (int i = 0; i < (DATE_COUNT * 2); i++) {
|
||||
Date* date = new Date(getSceneHeap(), mpLayoutFile, "arc", "my_IplTop_f.brlyt");
|
||||
if (i < DATE_COUNT) {
|
||||
nw4r::ut::List_Append(&mDrawList, date);
|
||||
nw4r::ut::List_Append(&unk_0x90, date);
|
||||
}
|
||||
nw4r::ut::List_Append(&mDateList, date);
|
||||
}
|
||||
@@ -382,10 +382,10 @@ namespace ipl {
|
||||
}
|
||||
} else {
|
||||
for (u32 i = 0; i < DATE_COUNT; i++) {
|
||||
((Date*)nw4r::ut::List_GetNth(&mDrawList, i))->draw(false);
|
||||
((Date*)nw4r::ut::List_GetNth(&unk_0x90, i))->draw(false);
|
||||
}
|
||||
for (u32 i = 0; i < DATE_COUNT; i++) {
|
||||
((Date*)nw4r::ut::List_GetNth(&mDrawList, i))->draw(true);
|
||||
((Date*)nw4r::ut::List_GetNth(&unk_0x90, i))->draw(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -425,8 +425,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Calendar::onPointDate(Date* date) {
|
||||
nw4r::ut::List_Remove(&mDrawList, date);
|
||||
nw4r::ut::List_Append(&mDrawList, date);
|
||||
nw4r::ut::List_Remove(&unk_0x90, date);
|
||||
nw4r::ut::List_Append(&unk_0x90, date);
|
||||
}
|
||||
|
||||
void Calendar::onTrigDate(Date* date) {
|
||||
@@ -503,7 +503,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Calendar::on_wait_task() {
|
||||
if (mbSearchTaskRunning == FALSE) {
|
||||
if (unk_0xA0 == FALSE) {
|
||||
switch (mPrevState) {
|
||||
case STATE_SCROLL_RIGHT: {
|
||||
do_scroll_r();
|
||||
@@ -535,7 +535,7 @@ namespace ipl {
|
||||
|
||||
mPrevState = mState;
|
||||
mState = STATE_SCROLL_RIGHT;
|
||||
if (mbSearchTaskRunning == TRUE) {
|
||||
if (unk_0xA0 == TRUE) {
|
||||
mbTaskCanceled = TRUE;
|
||||
mPrevState = STATE_SCROLL_RIGHT;
|
||||
mState = STATE_WAIT_TASK;
|
||||
@@ -577,7 +577,7 @@ namespace ipl {
|
||||
|
||||
mPrevState = mState;
|
||||
mState = STATE_SCROLL_LEFT;
|
||||
if (mbSearchTaskRunning) {
|
||||
if (unk_0xA0) {
|
||||
mbTaskCanceled = TRUE;
|
||||
mPrevState = STATE_SCROLL_LEFT;
|
||||
mState = STATE_WAIT_TASK;
|
||||
@@ -616,7 +616,7 @@ namespace ipl {
|
||||
mPrevState = mState;
|
||||
mState = STATE_DONE;
|
||||
|
||||
if (mbSearchTaskRunning == TRUE) {
|
||||
if (unk_0xA0 == TRUE) {
|
||||
OSReport("検索タスク終了要求\n"); // "Search task termination requested"
|
||||
mbTaskCanceled = TRUE;
|
||||
mPrevState = mState;
|
||||
@@ -863,14 +863,14 @@ namespace ipl {
|
||||
|
||||
OSReport("タスク終了\n"); // Task end
|
||||
|
||||
calendar->mbSearchTaskRunning = FALSE;
|
||||
calendar->unk_0xA0 = FALSE;
|
||||
calendar->mbTaskCanceled = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
void Calendar::exec_search_task() {
|
||||
OSReport("検索開始\n"); // Start search
|
||||
mbSearchTaskRunning = TRUE;
|
||||
unk_0xA0 = TRUE;
|
||||
System::getTask1()->requestJam(search_task_, this, NULL);
|
||||
}
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace ipl {
|
||||
DECOMP_FORCE_ACTIVE(iplDate_cpp, padding);
|
||||
|
||||
Date::Date(EGG::Heap* heap, nand::LayoutFile* file, const char* layoutFolder, const char* layoutFileName)
|
||||
: ::gui::EventHandler(), mbAppearMsg(0), mFocusState(0), mPendingFocusCmd(0), mpLayout(NULL), mpCurrentPaneAnim(0), mPointCount(0) {
|
||||
: ::gui::EventHandler(), mbAppearMsg(0), unk_0x10(0), unk_0x14(0), mpLayout(NULL), mpCurrentPaneAnim(0), unk_0x3C(0) {
|
||||
// Layout
|
||||
mpLayout = new layout::Object(heap, file, layoutFolder, layoutFileName);
|
||||
|
||||
@@ -103,16 +103,16 @@ namespace ipl {
|
||||
onCmdRecv(3);
|
||||
}
|
||||
|
||||
onCmdRecv(mPendingFocusCmd);
|
||||
onCmdRecv(unk_0x14);
|
||||
}
|
||||
|
||||
void Date::draw(bool unk) {
|
||||
if (unk) {
|
||||
if (mPointCount != 0) {
|
||||
if (unk_0x3C != 0) {
|
||||
mpLayout->draw();
|
||||
}
|
||||
} else {
|
||||
if (mPointCount == 0) {
|
||||
if (unk_0x3C == 0) {
|
||||
mpLayout->draw();
|
||||
}
|
||||
}
|
||||
@@ -210,7 +210,7 @@ namespace ipl {
|
||||
|
||||
void Date::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (mPointCount == 0) {
|
||||
if (unk_0x3C == 0) {
|
||||
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
|
||||
onCmdRecv(1);
|
||||
|
||||
@@ -221,16 +221,16 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
}
|
||||
mPointCount++;
|
||||
unk_0x3C++;
|
||||
}
|
||||
}
|
||||
|
||||
void Date::start_left_event(const char* paneName) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (mPointCount == 1) {
|
||||
if (unk_0x3C == 1) {
|
||||
onCmdRecv(2);
|
||||
}
|
||||
mPointCount--;
|
||||
unk_0x3C--;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -268,35 +268,35 @@ namespace ipl {
|
||||
|
||||
void Date::onCmdRecv(int cmd) {
|
||||
if (cmd == 1 || cmd == 2) {
|
||||
mPendingFocusCmd = cmd;
|
||||
unk_0x14 = cmd;
|
||||
}
|
||||
|
||||
switch (mFocusState) {
|
||||
switch (unk_0x10) {
|
||||
case 0: {
|
||||
if (cmd == 1) {
|
||||
mpCurrentPaneAnim = doAnim(IDANIM_FOCUS_IN);
|
||||
mFocusState = 1;
|
||||
unk_0x10 = 1;
|
||||
} else if (cmd == 2) {
|
||||
mpCurrentPaneAnim = doAnim(IDANIM_FOCUS_OUT);
|
||||
mFocusState = 2;
|
||||
unk_0x10 = 2;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
if (cmd == 3) {
|
||||
if (mPendingFocusCmd == 1) {
|
||||
mPendingFocusCmd = 0;
|
||||
if (unk_0x14 == 1) {
|
||||
unk_0x14 = 0;
|
||||
}
|
||||
mFocusState = 0;
|
||||
unk_0x10 = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
if (cmd == 3) {
|
||||
if (mPendingFocusCmd == 2) {
|
||||
mPendingFocusCmd = 0;
|
||||
if (unk_0x14 == 2) {
|
||||
unk_0x14 = 0;
|
||||
}
|
||||
mFocusState = 0;
|
||||
unk_0x10 = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -306,7 +306,7 @@ namespace ipl {
|
||||
void Date::initEvent() {
|
||||
mpGui->init();
|
||||
mpPaneAnims[ANIM_PANE_BTN_HOVER]->initAnmFrame(0.0f);
|
||||
mPointCount = 0;
|
||||
unk_0x3C = 0;
|
||||
onCmdRecv(3);
|
||||
}
|
||||
|
||||
|
||||
@@ -449,7 +449,7 @@ namespace ipl {
|
||||
|
||||
mpRsoExpHeaps[0] = EGG::ExpHeap::create(0x80000, System::getMem2App(), MEM_HEAP_OPT_THREAD_SAFE | MEM_HEAP_OPT_DEBUG_FILL);
|
||||
mpRsoExpHeaps[1] = EGG::ExpHeap::create(0x80000, System::getMem2App(), MEM_HEAP_OPT_THREAD_SAFE | MEM_HEAP_OPT_DEBUG_FILL);
|
||||
getButton()->setSuppressNewMailAnm(true);
|
||||
getButton()->setUnk_0x105(true);
|
||||
}
|
||||
|
||||
void ChannelTitle::calcCommon() {
|
||||
@@ -931,7 +931,7 @@ namespace ipl {
|
||||
|
||||
System::getChannelManager()->resetChJumpLoad();
|
||||
|
||||
getButton()->setSuppressNewMailAnm(false);
|
||||
getButton()->setUnk_0x105(false);
|
||||
}
|
||||
|
||||
BOOL ChannelTitle::isResetAcceptable() const {
|
||||
|
||||
@@ -71,7 +71,7 @@ namespace ipl {
|
||||
mSelectedFaceId = -1;
|
||||
mpNigaoe = NULL;
|
||||
mbClosing = false;
|
||||
mbResetAcceptable = true;
|
||||
unk_0x7D = true;
|
||||
mNwc24ErrCountdown = 0;
|
||||
mbToFriend = false;
|
||||
|
||||
@@ -385,7 +385,7 @@ namespace ipl {
|
||||
|
||||
snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
|
||||
mbResetAcceptable = false;
|
||||
unk_0x7D = false;
|
||||
|
||||
// Copy letter contents
|
||||
wmemcpy(mWCString, getMemoInputForm()->getSendString()->getWCString(), WC_STRING_LENGTH);
|
||||
@@ -409,7 +409,7 @@ namespace ipl {
|
||||
closeNWC24();
|
||||
}
|
||||
|
||||
mbResetAcceptable = true;
|
||||
unk_0x7D = true;
|
||||
|
||||
// Button animation
|
||||
button->animation(Button::IDANIM_SELECT_CREATE_R);
|
||||
|
||||
@@ -17,16 +17,8 @@ namespace ipl {
|
||||
class SensitivityDrawing {
|
||||
public:
|
||||
static void draw(nand::File* texture);
|
||||
private:
|
||||
static void verticalScale(f32 height, f32& scale);
|
||||
static f32 horizontalScale(f32 width);
|
||||
static f32 projectY(s32 y, f32 scale);
|
||||
};
|
||||
|
||||
void SensitivityDrawing::verticalScale(f32 height, f32& scale) { scale = 0.5f * height / 768.0f; }
|
||||
f32 SensitivityDrawing::horizontalScale(f32 width) { return 0.5f * width / 1024.0f; }
|
||||
f32 SensitivityDrawing::projectY(s32 y, f32 scale) { return (y - 384) * scale; }
|
||||
|
||||
void SensitivityDrawing::draw(nand::File* texture) {
|
||||
GXRenderModeObj renderMode = *System::getRenderModeObj();
|
||||
nw4r::ut::Rect projection;
|
||||
@@ -55,9 +47,8 @@ void SensitivityDrawing::draw(nand::File* texture) {
|
||||
GXInitTexObjWrapMode(&image, GX_MIRROR, GX_MIRROR);
|
||||
f32 width = projection.GetWidth();
|
||||
f32 height = projection.GetHeight();
|
||||
f32 horizontalScale = SensitivityDrawing::horizontalScale(width);
|
||||
f32 verticalScale;
|
||||
SensitivityDrawing::verticalScale(height, verticalScale);
|
||||
f32 horizontalScale = (0.5f * width) / 1024.0f;
|
||||
f32 verticalScale = (0.5f * height) / 768.0f;
|
||||
int sample = WPADGetLatestIndexInBuf(controller->getChannel());
|
||||
DPDObject* object;
|
||||
DPDObject* first;
|
||||
@@ -85,7 +76,7 @@ void SensitivityDrawing::draw(nand::File* texture) {
|
||||
if (object->size != 0) {
|
||||
f32 radius = 0.15f * (object->size + 25);
|
||||
f32 x = (object->x - 512) * horizontalScale;
|
||||
f32 y = projectY(object->y, verticalScale);
|
||||
f32 y = (object->y - 384) * verticalScale;
|
||||
GXColor foreground = {255, 255, 255, 255};
|
||||
nw4r::ut::Rect rectangle(x - radius, -y + radius - -45.0f,
|
||||
x + radius, -y - radius - -45.0f);
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
TextWriter::TextWriter(EGG::Heap* heap)
|
||||
: FaderSceneBase(heap), mState(STATE_NORMAL), mSelectedFaceId(-1), mpNigaoe(NULL), mbClosing(false), mbResetAcceptable(true),
|
||||
: FaderSceneBase(heap), mState(STATE_NORMAL), mSelectedFaceId(-1), mpNigaoe(NULL), mbClosing(false), unk_0x7D(true),
|
||||
mNwc24ErrCountdown(0) {
|
||||
setSceneParentFlags(SCN_PARENTFLAG_DRAW | SCN_PARENTFLAG_CALC);
|
||||
}
|
||||
@@ -87,7 +87,7 @@ namespace ipl {
|
||||
mSelectedFaceId = -1;
|
||||
mpNigaoe = NULL;
|
||||
mbClosing = false;
|
||||
mbResetAcceptable = true;
|
||||
unk_0x7D = true;
|
||||
mNwc24ErrCountdown = 0;
|
||||
|
||||
// Text balloon for Mii face
|
||||
@@ -398,7 +398,7 @@ namespace ipl {
|
||||
|
||||
snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
|
||||
mbResetAcceptable = false;
|
||||
unk_0x7D = false;
|
||||
|
||||
// Copy memo contents
|
||||
wmemcpy(mWCString, getMemoInputForm()->getSendString()->getWCString(), WC_STRING_LENGTH);
|
||||
@@ -412,7 +412,7 @@ namespace ipl {
|
||||
|
||||
closeNWC24();
|
||||
|
||||
mbResetAcceptable = true;
|
||||
unk_0x7D = true;
|
||||
|
||||
// Receive sent memo
|
||||
System::receiveImmediately();
|
||||
|
||||
@@ -10,6 +10,13 @@
|
||||
#undef IPL_SOUND_RECT_OUT_OF_LINE
|
||||
#undef AutoLock
|
||||
|
||||
extern "C" void __ct__Q23EGG20SimpleAudioMgrWithFxFv();
|
||||
extern "C" void __dt__Q34nw4r3snd11SoundHandleFv();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" {
|
||||
void __destroy_arr();
|
||||
void __dt__Q33ipl3snd10tagSSeInfoFv();
|
||||
}
|
||||
extern "C" void _seBlk__Q23ipl3snd();
|
||||
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
|
||||
extern "C" const f32 scSoundZeroF;
|
||||
@@ -17,9 +24,19 @@ extern "C" const f32 scSoundOneF;
|
||||
extern "C" const f32 scSoundTwoF;
|
||||
extern "C" const f32 scSoundThirtyF;
|
||||
extern "C" const f32 scSoundSixtyF;
|
||||
extern "C" {
|
||||
void _savegpr_29();
|
||||
void pauseOffSE__Q33ipl3snd6SystemFv();
|
||||
void pauseOnSE__Q33ipl3snd6SystemFv();
|
||||
}
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _restgpr_24();
|
||||
extern "C" void _savegpr_26();
|
||||
extern "C" void _restgpr_26();
|
||||
extern "C" void sBannerSoundPlayer__Q23ipl3snd();
|
||||
extern "C" void pause__17BannerSoundPlayerFb();
|
||||
extern "C" void initFx__Q33ipl3snd6SystemFv();
|
||||
extern "C" void GetInstance__Q44nw4r3snd6detail9AxManagerFv();
|
||||
extern "C" void ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi();
|
||||
extern "C" void stop__17BannerSoundPlayerFUl();
|
||||
@@ -28,8 +45,9 @@ extern "C" void SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi();
|
||||
|
||||
namespace ipl {
|
||||
namespace snd {
|
||||
extern "C" void __vt__Q33ipl3snd6System();
|
||||
|
||||
inline System::System() {
|
||||
System::System() {
|
||||
}
|
||||
|
||||
struct tagSSeInfo {
|
||||
@@ -41,30 +59,39 @@ namespace ipl {
|
||||
u32 id;
|
||||
};
|
||||
|
||||
inline tagSSeInfo::tagSSeInfo() {
|
||||
tagSSeInfo::tagSSeInfo() {
|
||||
}
|
||||
|
||||
BOOL m_isLocked;
|
||||
struct tagSBgmInfo {
|
||||
nw4r::snd::SoundHandle handle;
|
||||
tagSBgmInfo();
|
||||
~tagSBgmInfo();
|
||||
};
|
||||
|
||||
inline tagSBgmInfo::tagSBgmInfo() {
|
||||
tagSBgmInfo::tagSBgmInfo() {
|
||||
}
|
||||
|
||||
inline tagSSeInfo::~tagSSeInfo() {
|
||||
tagSSeInfo::~tagSSeInfo() {
|
||||
}
|
||||
|
||||
inline tagSBgmInfo::~tagSBgmInfo() {
|
||||
tagSBgmInfo::~tagSBgmInfo() {
|
||||
}
|
||||
|
||||
tagSSeInfo _seBlk[16];
|
||||
tagSBgmInfo _bgmBlk;
|
||||
System sSystem;
|
||||
BannerSoundPlayer sBannerSoundPlayer;
|
||||
nw4r::snd::SoundHandle* _mainBGMHandle;
|
||||
BOOL m_isLocked;
|
||||
extern nw4r::snd::SoundHandle _bgmBlk;
|
||||
extern tagSSeInfo _seBlk[16];
|
||||
extern nw4r::snd::SoundHandle* _mainBGMHandle;
|
||||
|
||||
extern "C" asm void __dt__Q33ipl3snd6UnkClsFv() {
|
||||
nofralloc
|
||||
lis r3, _seBlk__Q23ipl3snd@ha
|
||||
lis r4, __dt__Q33ipl3snd10tagSSeInfoFv@ha
|
||||
addi r3, r3, _seBlk__Q23ipl3snd@l
|
||||
li r5, 0xc
|
||||
addi r4, r4, __dt__Q33ipl3snd10tagSSeInfoFv@l
|
||||
li r6, 0x10
|
||||
b __destroy_arr
|
||||
}
|
||||
|
||||
static const nw4r::snd::FxReverbHi::ReverbHiParam reverbHiParam = {
|
||||
0.0f,
|
||||
@@ -75,6 +102,183 @@ namespace ipl {
|
||||
1.0f,
|
||||
};
|
||||
|
||||
void System::stopBGM(int frames) {
|
||||
if (_mainBGMHandle && _mainBGMHandle->IsAttachedSound()) {
|
||||
_mainBGMHandle->Stop(frames);
|
||||
}
|
||||
}
|
||||
|
||||
void System::muteOnBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(0.0f, frames);
|
||||
}
|
||||
|
||||
void System::muteOffBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(1.0f, frames);
|
||||
}
|
||||
|
||||
void System::pauseOnSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(true, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOffSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(false, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOnBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(true, 5);
|
||||
pauseOnSE();
|
||||
sBannerSoundPlayer.pause(true);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_A, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_B, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_C, 250);
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOffBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
initFx();
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(false, 5);
|
||||
pauseOffSE();
|
||||
sBannerSoundPlayer.pause(false);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" asm void stopSE__Q33ipl3snd6SystemFPQ34nw4r3snd11SoundHandlei() {
|
||||
nofralloc
|
||||
stwu r1, -0x30(r1)
|
||||
mflr r0
|
||||
stw r0, 0x34(r1)
|
||||
addi r11, r1, 0x30
|
||||
bl _savegpr_24
|
||||
cmpwi r4, 0
|
||||
mr r24, r4
|
||||
mr r25, r5
|
||||
beq stopSE_done
|
||||
lwz r0, 0(r4)
|
||||
cmpwi r0, 0
|
||||
beq stopSE_done
|
||||
li r26, 0
|
||||
lis r3, 1
|
||||
lis r28, _seBlk__Q23ipl3snd@ha
|
||||
li r31, 0
|
||||
mr r29, r26
|
||||
subi r30, r3, 1
|
||||
addi r28, r28, _seBlk__Q23ipl3snd@l
|
||||
stopSE_loop:
|
||||
add r27, r28, r31
|
||||
cmplw r24, r27
|
||||
bne stopSE_next
|
||||
lwz r3, 0(r27)
|
||||
cmpwi r3, 0
|
||||
beq stopSE_clear
|
||||
lwz r12, 0(r3)
|
||||
mr r4, r25
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
stopSE_clear:
|
||||
stw r29, 0x4(r27)
|
||||
stw r30, 0x8(r27)
|
||||
stopSE_next:
|
||||
addi r26, r26, 1
|
||||
addi r31, r31, 0xc
|
||||
cmpwi r26, 0x10
|
||||
blt stopSE_loop
|
||||
stopSE_done:
|
||||
addi r11, r1, 0x30
|
||||
bl _restgpr_24
|
||||
lwz r0, 0x34(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x30
|
||||
blr
|
||||
}
|
||||
|
||||
extern "C" asm void resetAllSound__Q33ipl3snd6SystemFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
addi r11, r1, 0x20
|
||||
bl _savegpr_26
|
||||
li r26, 0
|
||||
lis r28, _seBlk__Q23ipl3snd@ha
|
||||
lis r3, 1
|
||||
li r31, 0
|
||||
mr r29, r26
|
||||
addi r28, r28, _seBlk__Q23ipl3snd@l
|
||||
subi r30, r3, 1
|
||||
resetAllSound_loop:
|
||||
lwzx r3, r28, r31
|
||||
add r27, r28, r31
|
||||
cmpwi r3, 0
|
||||
beq resetAllSound_clear
|
||||
lwz r12, 0(r3)
|
||||
li r4, 0
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
resetAllSound_clear:
|
||||
stw r29, 0x4(r27)
|
||||
addi r26, r26, 1
|
||||
cmpwi r26, 0x10
|
||||
addi r31, r31, 0xc
|
||||
stw r30, 0x8(r27)
|
||||
blt resetAllSound_loop
|
||||
lwz r3, _mainBGMHandle__Q23ipl3snd
|
||||
cmpwi r3, 0
|
||||
beq resetAllSound_banner
|
||||
lwz r0, 0(r3)
|
||||
cmpwi r0, 0
|
||||
beq resetAllSound_banner
|
||||
lwz r3, 0(r3)
|
||||
li r4, 0
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
resetAllSound_banner:
|
||||
lis r31, sBannerSoundPlayer__Q23ipl3snd@ha
|
||||
li r4, 0
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl stop__17BannerSoundPlayerFUl
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 0
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 1
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 2
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
lfs f1, scSoundZeroF
|
||||
li r4, 0
|
||||
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
|
||||
lfs f1, scSoundZeroF
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl setMasterVolume__17BannerSoundPlayerFf
|
||||
addi r11, r1, 0x20
|
||||
bl _restgpr_26
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
}
|
||||
|
||||
void System::shutup(BOOL shutUpDMA) {
|
||||
if (m_isLocked == shutUpDMA) {
|
||||
return;
|
||||
@@ -111,10 +315,32 @@ namespace ipl {
|
||||
sBannerSoundPlayer.setMasterVolume(0.9f);
|
||||
}
|
||||
|
||||
extern "C" const f32 scSoundZeroF = 0.0f;
|
||||
|
||||
void System::stopBannerSound(int unk) {
|
||||
sBannerSoundPlayer.stop(unk);
|
||||
}
|
||||
|
||||
BOOL System::checkTmpSoundFile(void* data, u32 size) {
|
||||
return sBannerSoundPlayer.checkData(data, size, false);
|
||||
}
|
||||
|
||||
void System::initFx() {
|
||||
setFxReverbHi(nw4r::snd::AUX_A, &reverbHiParam);
|
||||
}
|
||||
|
||||
#pragma force_active on
|
||||
|
||||
}
|
||||
}
|
||||
namespace nw4r {
|
||||
namespace snd {
|
||||
SoundHandle::SoundHandle() : mSound(NULL) {}
|
||||
}
|
||||
}
|
||||
namespace ipl {
|
||||
namespace snd {
|
||||
|
||||
void System::calc() {
|
||||
EGG::SimpleAudioMgr::calc();
|
||||
sBannerSoundPlayer.calc();
|
||||
@@ -125,9 +351,9 @@ namespace ipl {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EGG::ArcPlayer::startSound(&_bgmBlk.handle, bgmName);
|
||||
_mainBGMHandle = &_bgmBlk.handle;
|
||||
return &_bgmBlk.handle;
|
||||
EGG::ArcPlayer::startSound(&_bgmBlk, bgmName);
|
||||
_mainBGMHandle = &_bgmBlk;
|
||||
return &_bgmBlk;
|
||||
}
|
||||
|
||||
nw4r::snd::SoundHandle* System::startSE(const char* sndName) {
|
||||
@@ -196,7 +422,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
block->handle.Stop(0);
|
||||
EGG::ArcPlayer::startSound(&block->handle, sndIndex);
|
||||
mSoundArchivePlayer.StartSound(&block->handle, sndIndex);
|
||||
block->id = sndIndex;
|
||||
return (int)block;
|
||||
}
|
||||
@@ -294,27 +520,6 @@ namespace ipl {
|
||||
return (int)block;
|
||||
}
|
||||
|
||||
void System::stopBGM(int frames) {
|
||||
if (_mainBGMHandle && _mainBGMHandle->IsAttachedSound()) {
|
||||
_mainBGMHandle->Stop(frames);
|
||||
}
|
||||
}
|
||||
|
||||
void System::stopSE(nw4r::snd::SoundHandle* handle, int frames) {
|
||||
tagSSeInfo* block;
|
||||
int i;
|
||||
if (handle != NULL && handle->IsAttachedSound()) {
|
||||
for (i = 0; i < 16; i++) {
|
||||
block = &_seBlk[i];
|
||||
if (handle == &block->handle) {
|
||||
block->handle.Stop(frames);
|
||||
block->name = NULL;
|
||||
block->id = 0xFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::stopAllSound(int unk) {
|
||||
int frame;
|
||||
tagSSeInfo* block;
|
||||
@@ -338,137 +543,6 @@ namespace ipl {
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_C, frame);
|
||||
}
|
||||
|
||||
extern "C" asm void resetAllSound__Q33ipl3snd6SystemFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
addi r11, r1, 0x20
|
||||
bl _savegpr_26
|
||||
li r26, 0
|
||||
lis r28, _seBlk__Q23ipl3snd@ha
|
||||
lis r3, 1
|
||||
li r31, 0
|
||||
mr r29, r26
|
||||
addi r28, r28, _seBlk__Q23ipl3snd@l
|
||||
subi r30, r3, 1
|
||||
resetAllSound_loop:
|
||||
lwzx r3, r28, r31
|
||||
add r27, r28, r31
|
||||
cmpwi r3, 0
|
||||
beq resetAllSound_clear
|
||||
lwz r12, 0(r3)
|
||||
li r4, 0
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
resetAllSound_clear:
|
||||
stw r29, 0x4(r27)
|
||||
addi r26, r26, 1
|
||||
cmpwi r26, 0x10
|
||||
addi r31, r31, 0xc
|
||||
stw r30, 0x8(r27)
|
||||
blt resetAllSound_loop
|
||||
lwz r3, _mainBGMHandle__Q23ipl3snd
|
||||
cmpwi r3, 0
|
||||
beq resetAllSound_banner
|
||||
lwz r0, 0(r3)
|
||||
cmpwi r0, 0
|
||||
beq resetAllSound_banner
|
||||
lwz r3, 0(r3)
|
||||
li r4, 0
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
resetAllSound_banner:
|
||||
lis r31, sBannerSoundPlayer__Q23ipl3snd@ha
|
||||
li r4, 0
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl stop__17BannerSoundPlayerFUl
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 0
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 1
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 2
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
lfs f1, scSoundZeroF
|
||||
li r4, 0
|
||||
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
|
||||
lfs f1, scSoundZeroF
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl setMasterVolume__17BannerSoundPlayerFf
|
||||
addi r11, r1, 0x20
|
||||
bl _restgpr_26
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
namespace nw4r {
|
||||
namespace snd {
|
||||
inline SoundHandle::SoundHandle() : mSound(NULL) {}
|
||||
}
|
||||
}
|
||||
namespace ipl {
|
||||
namespace snd {
|
||||
|
||||
void System::muteOnBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(scSoundZeroF, frames);
|
||||
}
|
||||
|
||||
void System::muteOffBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(scSoundOneF, frames);
|
||||
}
|
||||
|
||||
void System::pauseOnBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(true, 5);
|
||||
pauseOnSE();
|
||||
sBannerSoundPlayer.pause(true);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_A, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_B, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_C, 250);
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOffBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
initFx();
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(false, 5);
|
||||
pauseOffSE();
|
||||
sBannerSoundPlayer.pause(false);
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOnSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(true, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOffSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(false, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::setOutputMode(EAudioOutputMode mode) {
|
||||
nw4r::snd::OutputMode outputMode;
|
||||
|
||||
@@ -550,14 +624,6 @@ namespace snd {
|
||||
return sBannerSoundPlayer.start(data, size);
|
||||
}
|
||||
|
||||
void System::stopBannerSound(int unk) {
|
||||
sBannerSoundPlayer.stop(unk);
|
||||
}
|
||||
|
||||
BOOL System::checkTmpSoundFile(void* data, u32 size) {
|
||||
return sBannerSoundPlayer.checkData(data, size, false);
|
||||
}
|
||||
|
||||
long System::clipGELT_S32(long value, long lo, long hi) {
|
||||
long range = hi - lo;
|
||||
|
||||
@@ -576,10 +642,5 @@ namespace snd {
|
||||
|
||||
return value;
|
||||
}
|
||||
extern "C" const f32 scSoundZeroF = 0.0f;
|
||||
extern "C" const f32 scSoundTwoF = 2.0f;
|
||||
extern "C" const f32 scSoundOneF = 1.0f;
|
||||
extern "C" const f32 scSoundThirtyF = 30.0f;
|
||||
extern "C" const f32 scSoundSixtyF = 60.0f;
|
||||
} // namespace snd
|
||||
} // namespace ipl
|
||||
|
||||
@@ -150,7 +150,7 @@ namespace ipl {
|
||||
myWork->sdWriteProtected = FALSE;
|
||||
myWork->prevAsyncResult = RESULT_WORKING;
|
||||
|
||||
mbCancel = false;
|
||||
unk_0x04 = false;
|
||||
|
||||
OSResumeThread(&myWork->thread);
|
||||
}
|
||||
@@ -1235,7 +1235,7 @@ namespace ipl {
|
||||
int result;
|
||||
OSReport("NandSDWorker: cleaning partial nand app...\n");
|
||||
for (int i = 0; i < titleIdCount; i++) {
|
||||
if (mbCancel != false) {
|
||||
if (unk_0x04 != false) {
|
||||
return RESULT_UNK_18;
|
||||
}
|
||||
|
||||
@@ -4877,7 +4877,7 @@ namespace ipl {
|
||||
strncat(fmtStr, fileName, NAND_MAX_PATH);
|
||||
|
||||
while (faErr == FA_ERR_SUCCESS) {
|
||||
if (mbCancel != false) {
|
||||
if (unk_0x04 != false) {
|
||||
return RESULT_UNK_18;
|
||||
}
|
||||
|
||||
|
||||
@@ -1015,28 +1015,51 @@ namespace ipl {
|
||||
return -1;
|
||||
}
|
||||
|
||||
int Manager::isEqualChannel(ESTitleId titleId0, ESTitleId titleId1) {
|
||||
if (titleId0 == titleId1) {
|
||||
return -2;
|
||||
}
|
||||
|
||||
if (TITLE_NO_REGION(titleId0) == TITLE_NO_REGION(titleId1)) {
|
||||
if (TITLE_REGION(titleId0) != TITLE_REGION_ALL) {
|
||||
if (TITLE_REGION(titleId1) == TITLE_REGION_ALL) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (TITLE_REGION(titleId0) == TITLE_REGION_ALL) {
|
||||
if (TITLE_REGION(titleId1) != TITLE_REGION_ALL) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
return -1;
|
||||
asm int Manager::isEqualChannel(register ESTitleId titleId0, register ESTitleId titleId1) {
|
||||
nofralloc
|
||||
xor r3, r6, r8
|
||||
xor r0, r5, r7
|
||||
or. r0, r3, r0
|
||||
bne isEqualChannel_L1
|
||||
li r3, -2
|
||||
blr
|
||||
isEqualChannel_L1:
|
||||
li r3, -0x100
|
||||
li r0, -1
|
||||
and r9, r6, r3
|
||||
and r3, r8, r3
|
||||
and r4, r5, r0
|
||||
and r0, r7, r0
|
||||
xor r3, r9, r3
|
||||
xor r0, r4, r0
|
||||
or. r0, r3, r0
|
||||
bne isEqualChannel_L4
|
||||
clrlwi r3, r6, 0x18
|
||||
xori r0, r3, 0x41
|
||||
cmpwi r0, 0
|
||||
beq isEqualChannel_L2
|
||||
clrlwi r0, r8, 0x18
|
||||
xori r0, r0, 0x41
|
||||
cmpwi r0, 0
|
||||
bne isEqualChannel_L2
|
||||
li r3, 0
|
||||
blr
|
||||
isEqualChannel_L2:
|
||||
xori r0, r3, 0x41
|
||||
cmpwi r0, 0
|
||||
bne isEqualChannel_L3
|
||||
clrlwi r0, r8, 0x18
|
||||
xori r0, r0, 0x41
|
||||
cmpwi r0, 0
|
||||
beq isEqualChannel_L3
|
||||
li r3, 1
|
||||
blr
|
||||
isEqualChannel_L3:
|
||||
li r3, -1
|
||||
blr
|
||||
isEqualChannel_L4:
|
||||
li r3, -1
|
||||
blr
|
||||
}
|
||||
|
||||
int Manager::isDefaultChannel(ESTitleId32 titleType, ESTitleId32 titleCode) {
|
||||
|
||||
@@ -196,12 +196,45 @@ namespace ipl {
|
||||
smArg.mbFontResLoaded = true;
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
asm void System::constructSND_(register void* work) {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
li r4, 0x20
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
lis r31, smArg__Q23ipl6System@ha
|
||||
addi r31, r31, smArg__Q23ipl6System@l
|
||||
stw r30, 0x8(r1)
|
||||
lwz r3, 0x14(r31)
|
||||
lwz r5, 0xf4(r31)
|
||||
lwz r12, 0(r3)
|
||||
lwz r30, 0xa0(r5)
|
||||
lwz r12, 0x24(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r5, 0x14(r31)
|
||||
lis r7, sSystem__Q23ipl3snd@ha
|
||||
mr r6, r3
|
||||
mr r4, r30
|
||||
addi r3, r7, sSystem__Q23ipl3snd@l
|
||||
bl initOnMemory__Q33ipl3snd6SystemFPCvPQ23EGG4HeapUl
|
||||
li r0, 1
|
||||
stb r0, 0x2b7(r31)
|
||||
lwz r0, 0x14(r1)
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 0x8(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
}
|
||||
#else
|
||||
void System::constructSND_(void* work) {
|
||||
const void* buffer = smArg.mResources.file[Arg::SOUND]->getBuffer();
|
||||
u32 size = getSoundHeap()->getAllocatableSize(32);
|
||||
snd::getSystem()->initOnMemory(buffer, getSoundHeap(), size);
|
||||
snd::getSystem()->initOnMemory(smArg.mResources.file[Arg::SOUND]->getBuffer(), getSoundHeap(), getSoundHeap()->getAllocatableSize(32));
|
||||
smArg.mbSndResLoaded = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
void* System::loadZiDIC_(void* arcData, const char* fileName) {
|
||||
void* buffer = NULL;
|
||||
|
||||
@@ -5,11 +5,9 @@ Paths follow ctxdiff.py: build/43U/{src,obj}/<unit>.o. Requires pyelftools.
|
||||
Exit 0: all selected tables match (or no tables); 1: mismatch; 2: invalid or
|
||||
ambiguous input. This checks relative destinations, not behavioral equivalence.
|
||||
|
||||
Automatic selection covers jumptable_* symbols and multi-entry data objects
|
||||
whose R_PPC_ADDR32 entries all target the selected function, with at least one
|
||||
interior destination for objects lacking the jumptable_ prefix. This includes
|
||||
compiler-generated @ names and custom names, but excludes ordinary callback
|
||||
tables/vtables. Source locations are inferred from corresponding function relocations,
|
||||
Automatic selection covers local jumptable_* symbols whose R_PPC_ADDR32 entries
|
||||
all target the selected function. External callback tables/vtables are not
|
||||
covered. Source locations are inferred from corresponding function relocations,
|
||||
never from an assumption that both data sections have the same layout.
|
||||
"""
|
||||
|
||||
@@ -115,11 +113,7 @@ def jump_target(obj, relocation, function):
|
||||
|
||||
def reference_tables(obj, function, name=None):
|
||||
candidates = [obj.symbol(name)] if name else [
|
||||
s for s in obj.symbols if s.size and (
|
||||
s.name.startswith("jumptable_") or (
|
||||
s.kind == "STT_OBJECT" and s.size >= 8
|
||||
and isinstance(s.section, int)
|
||||
and obj.sections[s.section][0] in (".data", ".rodata", ".sdata", ".sdata2")))]
|
||||
s for s in obj.symbols if s.name.startswith("jumptable_") and s.size]
|
||||
result = []
|
||||
for table in candidates:
|
||||
if not isinstance(table.section, int) or table.size % 4:
|
||||
@@ -129,15 +123,10 @@ def reference_tables(obj, function, name=None):
|
||||
section_size = obj.sections[table.section][1]
|
||||
if table.value < 0 or table.value + table.size > section_size:
|
||||
raise ValueError("reference table is outside its section")
|
||||
targets = []
|
||||
for offset in range(table.value, table.value + table.size, 4):
|
||||
target = jump_target(obj, obj.relocs(table.section).get(offset), function)
|
||||
if target is None:
|
||||
break
|
||||
targets.append(target)
|
||||
if targets and len(targets) == table.size // 4:
|
||||
if name or table.name.startswith("jumptable_") or any(targets):
|
||||
result.append((table, targets))
|
||||
targets = [jump_target(obj, obj.relocs(table.section).get(offset), function)
|
||||
for offset in range(table.value, table.value + table.size, 4)]
|
||||
if targets and all(target is not None for target in targets):
|
||||
result.append((table, targets))
|
||||
elif name:
|
||||
raise ValueError("reference table does not target the selected function")
|
||||
return result
|
||||
|
||||
@@ -1,172 +0,0 @@
|
||||
{"event": "begin", "unit": "src/keyboard/tiPcKeyboard", "function": "setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode", "origin": "824fe9fc0a89bfca627e6f55e7190796a2bd81fe", "remote_source_identical": true, "diagnosis": "Frame and branches match. Target leaves keyMode undefined on invalid enum; ours initializes it and adds mr r31,r30. No undefined-value experiments allowed.", "initial": [106, 105, 99], "fuzzy": 99.04762}
|
||||
{"event": "pool", "unit": "src/keyboard/tiPcKeyboard", "output": "POOL IDENTICAL up to 204 (mine=204 base=204)\n"}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode", "label": "defined masked enum fallback", "compiled": true, "instructions": [106, 105, 101], "fuzzy": 99.04762, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode", "label": "defined direct-mode fallback", "compiled": true, "instructions": [106, 105, 101], "fuzzy": 99.04762, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode", "label": "defined current-mode fallback", "compiled": true, "instructions": [107, 105, 98], "fuzzy": 98.09524, "regressions": [], "measures": {"fuzzy_match_percent": 99.959274, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "restored", "unit": "src/keyboard/tiPcKeyboard", "function": "setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode", "instructions": [106, 105, 99]}
|
||||
{"event": "begin", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "origin": "824fe9fc0a89bfca627e6f55e7190796a2bd81fe", "remote_source_identical": true, "diagnosis": "Identical frame, branches and instruction counts; inlined setABCFlag flags and owner exchange r4/r6. Try setter argument boundary, owner lifetime, then declaration order.", "initial": [49, 49, 8], "fuzzy": 99.081635}
|
||||
{"event": "pool", "unit": "src/keyboard/tiPcKeyboard", "output": "POOL IDENTICAL up to 204 (mine=204 base=204)\n"}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "inline setter with explicit state and flags arguments", "compiled": true, "instructions": [49, 49, 8], "fuzzy": 99.081635, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "inline setter reads owner directly without temporary", "compiled": true, "instructions": [49, 49, 8], "fuzzy": 99.081635, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "bind key state reference before flag extraction", "compiled": true, "instructions": [49, 49, 8], "fuzzy": 99.081635, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "restored", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "instructions": [49, 49, 8]}
|
||||
{"event": "begin", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "origin": "824fe9fc0a89bfca627e6f55e7190796a2bd81fe", "remote_source_identical": true, "diagnosis": "Identical frame, branches and instruction counts; inlined setABCFlag flags and owner exchange r4/r6. Try setter argument boundary, owner lifetime, then declaration order.", "initial": [39, 39, 8], "fuzzy": 98.84615}
|
||||
{"event": "pool", "unit": "src/keyboard/tiPcKeyboard", "output": "POOL IDENTICAL up to 204 (mine=204 base=204)\n"}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "inline setter with explicit state and flags arguments", "compiled": true, "instructions": [39, 39, 8], "fuzzy": 98.84615, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "inline setter reads owner directly without temporary", "compiled": true, "instructions": [39, 39, 11], "fuzzy": 98.46154, "regressions": [], "measures": {"fuzzy_match_percent": 99.971214, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "bind key state reference before flag extraction", "compiled": true, "instructions": [39, 39, 8], "fuzzy": 98.84615, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "restored", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "instructions": [39, 39, 8]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_is_master_boot_sector", "origin": "824fe9fc0a89bfca627e6f55e7190796a2bd81fe", "remote_source_identical": true, "diagnosis": "Target frame 0x30 saves r30/r31; ours frame 0x40 saves r29/r30/r31. Target high byte load precedes mid and low byte grouped addition. Pointer and index order differ; correct endian expression/helper first.", "initial": [86, 84, 84], "fuzzy": 86.5}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_is_master_boot_sector", "label": "inline endian helper with high byte first and two addition groups", "compiled": true, "instructions": [84, 84, 48], "fuzzy": 83.72619, "regressions": [], "measures": {"fuzzy_match_percent": 93.22928, "total_code": "3716", "matched_code": "2072", "matched_code_percent": 55.75888, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 17, "matched_functions_percent": 85.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_is_master_boot_sector", "label": "evaluate high byte group before low byte group", "compiled": true, "instructions": [86, 84, 85], "fuzzy": 82.27381, "regressions": [], "measures": {"fuzzy_match_percent": 93.09795, "total_code": "3716", "matched_code": "2072", "matched_code_percent": 55.75888, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 17, "matched_functions_percent": 85.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_is_master_boot_sector", "label": "declare traversal index after pointers at endian helper boundary", "compiled": true, "instructions": [84, 84, 42], "fuzzy": 84.559525, "regressions": [], "measures": {"fuzzy_match_percent": 93.30463, "total_code": "3716", "matched_code": "2072", "matched_code_percent": 55.75888, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 17, "matched_functions_percent": 85.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_is_master_boot_sector", "instructions": [86, 84, 84]}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_is_master_boot_sector", "label": "retain best structural helper for ctxdiff and declaration search", "compiled": true, "instructions": [84, 84, 42], "fuzzy": 84.559525, "regressions": [], "measures": {"fuzzy_match_percent": 93.30463, "total_code": "3716", "matched_code": "2072", "matched_code_percent": 55.75888, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 17, "matched_functions_percent": 85.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "declsearch", "function": "pdm_part_is_master_boot_sector", "result": "23 builds, structural 20 exact 42, no improvement"}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_is_master_boot_sector", "instructions": [86, 84, 84]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_get_start_sector", "origin": "824fe9fc0a89bfca627e6f55e7190796a2bd81fe", "remote_source_identical": true, "diagnosis": "Frame 0x2e0 and buffer/array offsets match, 276 instructions each; target groups endian addition as (byte2<<16 + byte0)+(byte3<<24 + byte1<<8), ours chained high-to-low additions. Target end-of-loop stores branch to common exit.", "initial": [276, 276, 146], "fuzzy": 82.56159}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_get_start_sector", "label": "group low and high endian additions to match target", "compiled": true, "instructions": [276, 276, 141], "fuzzy": 82.61957, "regressions": [], "measures": {"fuzzy_match_percent": 93.49731, "total_code": "3716", "matched_code": "2072", "matched_code_percent": 55.75888, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 17, "matched_functions_percent": 85.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_get_start_sector", "label": "reverse start/count array declaration order after endian grouping", "compiled": true, "instructions": [276, 276, 148], "fuzzy": 82.58696, "regressions": [], "measures": {"fuzzy_match_percent": 93.48762, "total_code": "3716", "matched_code": "2072", "matched_code_percent": 55.75888, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 17, "matched_functions_percent": 85.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_get_start_sector", "label": "common success exit from extended partition selection", "compiled": true, "instructions": [275, 276, 202], "fuzzy": 82.677536, "regressions": [], "measures": {"fuzzy_match_percent": 93.514534, "total_code": "3716", "matched_code": "2072", "matched_code_percent": 55.75888, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 17, "matched_functions_percent": 85.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_get_start_sector", "instructions": [276, 276, 146]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "origin": "824fe9fc0a89bfca627e6f55e7190796a2bd81fe", "remote_source_identical": true, "diagnosis": "51 instructions each with identical frame, branches and arithmetic. ratio and start swap r0/r3. Try conversion helper, narrower ratio, independent sector ratios, then declaration search.", "initial": [51, 51, 16], "fuzzy": 97.84314}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "inline start-sector conversion helper", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "use media-sector ratio with 16 bit type", "compiled": true, "instructions": [51, 51, 16], "fuzzy": 97.84314, "regressions": [], "measures": {"fuzzy_match_percent": 93.48009, "total_code": "3716", "matched_code": "2072", "matched_code_percent": 55.75888, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 17, "matched_functions_percent": 85.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "separate physical and logical ratios", "compiled": true, "instructions": [51, 51, 16], "fuzzy": 97.84314, "regressions": [], "measures": {"fuzzy_match_percent": 93.48009, "total_code": "3716", "matched_code": "2072", "matched_code_percent": 55.75888, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 17, "matched_functions_percent": 85.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "instructions": [51, 51, 16]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "origin": "3c9af06f34375ee53e621fc7b90d9f211fd6ee88", "remote_source_identical": true, "diagnosis": "Arithmetic inline helper produced standalone exact match but regressed logical read/write. Test real helper argument order while protecting both callers.", "initial": [51, 51, 16], "fuzzy": 97.84314}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "conversion helper argument order start,media_bps,bps", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "conversion helper argument order start,bps,media_bps", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "conversion helper argument order media_bps,start,bps", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "conversion helper argument order media_bps,bps,start", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "conversion helper argument order bps,start,media_bps", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "conversion helper argument order bps,media_bps,start", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "instructions": [51, 51, 16]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "origin": "3c9af06f34375ee53e621fc7b90d9f211fd6ee88", "remote_source_identical": true, "diagnosis": "Conversion helper gives exact standalone but changes two already-exact inline callers. Try shared full conversion implementation with public wrapper and direct inline call sites, preserving real function.", "initial": [51, 51, 16], "fuzzy": 97.84314}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "full physical-sector helper with public wrapper", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "logical read/write call shared implementation directly", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "instructions": [51, 51, 16]}
|
||||
{"event": "begin", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "origin": "3c9af06f34375ee53e621fc7b90d9f211fd6ee88", "remote_source_identical": true, "diagnosis": "After frame/branch/helper diagnosis and three structural trials, test setter branch inversion, shared mode temporary, flags assignment lifetime. Check standalone setter and other callers for regressions.", "initial": [49, 49, 8], "fuzzy": 99.081635}
|
||||
{"event": "pool", "unit": "src/keyboard/tiPcKeyboard", "output": "POOL IDENTICAL up to 204 (mine=204 base=204)\n"}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "setter early return on unchanged modifier flags", "compiled": true, "instructions": [49, 49, 8], "fuzzy": 99.081635, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "setter names retained input mode before comparison", "compiled": true, "instructions": [50, 49, 41], "fuzzy": 91.734695, "regressions": ["setABCFlag__Q59textinput8keyboard6pctype4Base8KeyStateFUl", "onlyQwerty__Q49textinput8keyboard6pctype4BaseFb", "setLangKeyActive__Q49textinput8keyboard6pctype4BaseFb", "create__Q49textinput8keyboard6pctype12LayoutByNW4RFP12MEMAllocator", "onlyQwerty__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "setLangKeyActive__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv"], "measures": {"fuzzy_match_percent": 99.6742, "total_code": "28484", "matched_code": "24948", "matched_code_percent": 87.58601, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 131, "matched_functions_percent": 92.90781, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "separate assigned state and flags locals for declaration search", "compiled": true, "instructions": [49, 49, 8], "fuzzy": 99.081635, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "declsearch", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "output": "fewer than two leading declarations; pass --lines START END\n"}
|
||||
{"event": "restored", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "instructions": [49, 49, 8]}
|
||||
{"event": "begin", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "origin": "3c9af06f34375ee53e621fc7b90d9f211fd6ee88", "remote_source_identical": true, "diagnosis": "After frame/branch/helper diagnosis and three structural trials, test setter branch inversion, shared mode temporary, flags assignment lifetime. Check standalone setter and other callers for regressions.", "initial": [39, 39, 8], "fuzzy": 98.84615}
|
||||
{"event": "pool", "unit": "src/keyboard/tiPcKeyboard", "output": "POOL IDENTICAL up to 204 (mine=204 base=204)\n"}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "setter early return on unchanged modifier flags", "compiled": true, "instructions": [39, 39, 8], "fuzzy": 98.84615, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "setter names retained input mode before comparison", "compiled": true, "instructions": [40, 39, 34], "fuzzy": 94.48718, "regressions": ["setABCFlag__Q59textinput8keyboard6pctype4Base8KeyStateFUl", "onlyQwerty__Q49textinput8keyboard6pctype4BaseFb", "setLangKeyActive__Q49textinput8keyboard6pctype4BaseFb", "create__Q49textinput8keyboard6pctype12LayoutByNW4RFP12MEMAllocator", "onlyQwerty__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "setLangKeyActive__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv"], "measures": {"fuzzy_match_percent": 99.6742, "total_code": "28484", "matched_code": "24948", "matched_code_percent": 87.58601, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 131, "matched_functions_percent": 92.90781, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "separate assigned state and flags locals for declaration search", "compiled": true, "instructions": [39, 39, 8], "fuzzy": 98.84615, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "declsearch", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "output": "fewer than two leading declarations; pass --lines START END\n"}
|
||||
{"event": "restored", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "instructions": [39, 39, 8]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "origin": "9acff807814ebc31117a41f325bab0af803169cd", "remote_source_identical": true, "diagnosis": "126 instructions each, same frame. Target compares depth>=delay; target period step quotient precedes integer LFO resets and signed conversions; history stores follow all conversion stores. Try source/helper boundaries and history loop before register search.", "initial": [126, 126, 56], "fuzzy": 69.9127}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "compute period step first then initialize integer state before conversions", "compiled": true, "instructions": [126, 126, 55], "fuzzy": 69.11905, "regressions": [], "measures": {"fuzzy_match_percent": 91.1535, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "clear history through nested channel/sample loops after LFO conversions", "compiled": true, "instructions": [126, 126, 32], "fuzzy": 92.92857, "regressions": [], "measures": {"fuzzy_match_percent": 95.62444, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "inline LFO state initialization separate from history initialization", "compiled": true, "instructions": [126, 126, 55], "fuzzy": 70.07143, "regressions": [], "measures": {"fuzzy_match_percent": 91.33234, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "instructions": [126, 126, 56]}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "retain history loop structural candidate for diagnosis", "compiled": true, "instructions": [126, 126, 32], "fuzzy": 92.92857, "regressions": [], "measures": {"fuzzy_match_percent": 95.62444, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "history loop and target depth comparison with original constant encounter order", "compiled": true, "instructions": [126, 126, 17], "fuzzy": 95.77778, "regressions": [], "measures": {"fuzzy_match_percent": 96.15946, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "integer LFO state first with original floating expression encounter order", "compiled": true, "instructions": [126, 126, 17], "fuzzy": 97.7381, "regressions": [], "measures": {"fuzzy_match_percent": 96.52757, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "load named LFO rate before conversion expressions", "compiled": true, "instructions": [126, 126, 21], "fuzzy": 97.53968, "regressions": [], "measures": {"fuzzy_match_percent": 96.49031, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "inspect closest structural initialization candidate", "compiled": true, "instructions": [126, 126, 17], "fuzzy": 97.7381, "regressions": [], "measures": {"fuzzy_match_percent": 96.52757, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "target step multiplication operand order and retained depth quotient", "compiled": true, "instructions": [126, 126, 18], "fuzzy": 94.47619, "regressions": [], "measures": {"fuzzy_match_percent": 95.915054, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "split meaningful float and loop declarations for allocation search", "compiled": true, "instructions": [126, 126, 18], "fuzzy": 94.47619, "regressions": [], "measures": {"fuzzy_match_percent": 95.915054, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "declsearch", "function": "__InitParams", "output": "fewer than two leading declarations; pass --lines START END\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "retain quotient then divide step by table length", "compiled": true, "instructions": [126, 126, 24], "fuzzy": 97.2619, "regressions": [], "measures": {"fuzzy_match_percent": 96.43815, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "retain step and depth quotients before gradient conversion", "compiled": true, "instructions": [126, 126, 24], "fuzzy": 94.15873, "regressions": [], "measures": {"fuzzy_match_percent": 95.85544, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "name phase step before period step and convert afterward", "compiled": true, "instructions": [126, 126, 24], "fuzzy": 94.15873, "regressions": [], "measures": {"fuzzy_match_percent": 95.85544, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "instructions": [126, 126, 56]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "origin": "426555a34f7dd162e14bc28ead5f55168f090eb8", "remote_source_identical": true, "diagnosis": "Target 65 instructions with 0x10 frame and signed 64-bit value negation, expanded signed 64-bit gradient product, CTR sample loop. Ours 51 instructions, truncates manually and decrements GPR. Restore signed shifts, compound multiplication width and fixed loop.", "initial": [51, 65, 65], "fuzzy": 68.53846}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "label": "signed shifted 64 bit value and fixed count sample loop", "compiled": true, "instructions": [55, 65, 65], "fuzzy": 72.0, "regressions": [], "measures": {"fuzzy_match_percent": 91.637856, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "label": "compound gradient product from signed widened difference", "compiled": true, "instructions": [61, 65, 65], "fuzzy": 62.215385, "regressions": [], "measures": {"fuzzy_match_percent": 90.69002, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "label": "inline signed wide scaling helper for sample and gradient", "compiled": true, "instructions": [55, 65, 65], "fuzzy": 72.0, "regressions": [], "measures": {"fuzzy_match_percent": 91.637856, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "label": "inspect compound widened gradient candidate", "compiled": true, "instructions": [61, 65, 65], "fuzzy": 62.215385, "regressions": [], "measures": {"fuzzy_match_percent": 90.69002, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "label": "independent wide sample and gradient with shifts after both multiplications", "compiled": true, "instructions": [65, 65, 26], "fuzzy": 83.07692, "regressions": [], "measures": {"fuzzy_match_percent": 92.71088, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "label": "retain widened table difference directly in gradient product", "compiled": true, "instructions": [65, 65, 26], "fuzzy": 83.30769, "regressions": [], "measures": {"fuzzy_match_percent": 92.73323, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "label": "commute wide gradient operands after table subtraction", "compiled": true, "instructions": [65, 65, 26], "fuzzy": 83.30769, "regressions": [], "measures": {"fuzzy_match_percent": 92.73323, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "label": "compute sample product before widened table difference", "compiled": true, "instructions": [65, 65, 26], "fuzzy": 83.07692, "regressions": [], "measures": {"fuzzy_match_percent": 92.71088, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "label": "declare phase before signed value then assign phase", "compiled": true, "instructions": [65, 65, 26], "fuzzy": 83.07692, "regressions": [], "measures": {"fuzzy_match_percent": 92.71088, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "declsearch", "function": "__CalcLFO", "output": "declaration block:\n u32 phase;\n s64 value;\nstart (8, 26)\nbest (8, 26) after 2 builds; source restored; best order was:\n u32 phase;\n s64 value;\n"}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__CalcLFO", "instructions": [51, 65, 65]}
|
||||
{"event": "begin", "unit": "libs/RevoEX/src/net/aes", "function": "AESiEncryptBlock", "origin": "31d0f12981dba19bb149c7904032cb1bf5529c79", "remote_source_identical": true, "diagnosis": "158 instructions and 0x40 frames each. Target loads round count first then key cursor; source state initializers live across round temporaries. Target XORs low-byte lookup with rotated byte8 and prior byte24/16 pair, while ours groups final two byte operands. Try XOR tree, helper round boundary, independent declarations.", "initial": [158, 158, 134], "fuzzy": 60.348103}
|
||||
{"event": "pool", "unit": "libs/RevoEX/src/net/aes", "output": "POOL IDENTICAL up to 4 (mine=4 base=4)\n"}
|
||||
{"event": "attempt", "unit": "libs/RevoEX/src/net/aes", "function": "AESiEncryptBlock", "label": "explicit target low byte XOR association with nested high-byte pair", "compiled": true, "instructions": [158, 158, 134], "fuzzy": 60.348103, "regressions": [], "measures": {"fuzzy_match_percent": 75.11482, "total_code": "2752", "matched_code": "684", "matched_code_percent": 24.85465, "total_data": "2800", "matched_data": "2800", "matched_data_percent": 100.0, "total_functions": 9, "matched_functions": 6, "matched_functions_percent": 66.66667, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RevoEX/src/net/aes", "function": "AESiEncryptBlock", "label": "inline encryption round lookup helper with target association", "compiled": true, "instructions": [158, 158, 139], "fuzzy": 53.83544, "regressions": [], "measures": {"fuzzy_match_percent": 73.61919, "total_code": "2752", "matched_code": "684", "matched_code_percent": 24.85465, "total_data": "2800", "matched_data": "2800", "matched_data_percent": 100.0, "total_functions": 9, "matched_functions": 6, "matched_functions_percent": 66.66667, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RevoEX/src/net/aes", "function": "AESiEncryptBlock", "label": "separate leading state declarations from round-count and initial key loads", "compiled": true, "instructions": [158, 158, 134], "fuzzy": 60.348103, "regressions": [], "measures": {"fuzzy_match_percent": 75.11482, "total_code": "2752", "matched_code": "684", "matched_code_percent": 24.85465, "total_data": "2800", "matched_data": "2800", "matched_data_percent": 100.0, "total_functions": 9, "matched_functions": 6, "matched_functions_percent": 66.66667, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RevoEX/src/net/aes", "function": "AESiEncryptBlock", "instructions": [158, 158, 134]}
|
||||
{"event": "begin", "unit": "libs/RevoEX/src/net/aes", "function": "AESiDecryptBlock", "origin": "326273b6198accfc1e4062bacb677ed1eec1ab74", "remote_source_identical": true, "diagnosis": "Target 251 instructions versus 249, same 0x40 frame. Target computes context keys base once then round offset; source folds offset into context. Target inverse MixColumns mutates four/twice/value operands separately with rotated accumulator, ours reassociates XOR chains. Structural pointer and mix boundaries first.", "initial": [249, 251, 244], "fuzzy": 61.49004}
|
||||
{"event": "pool", "unit": "libs/RevoEX/src/net/aes", "output": "POOL IDENTICAL up to 4 (mine=4 base=4)\n"}
|
||||
{"event": "attempt", "unit": "libs/RevoEX/src/net/aes", "function": "AESiDecryptBlock", "label": "mutate inverse MixColumns intermediate terms in target operand order", "compiled": true, "instructions": [249, 251, 244], "fuzzy": 62.74502, "regressions": [], "measures": {"fuzzy_match_percent": 75.57268, "total_code": "2752", "matched_code": "684", "matched_code_percent": 24.85465, "total_data": "2800", "matched_data": "2800", "matched_data_percent": 100.0, "total_functions": 9, "matched_functions": 6, "matched_functions_percent": 66.66667, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RevoEX/src/net/aes", "function": "AESiDecryptBlock", "label": "retain key schedule base separately before round offset", "compiled": true, "instructions": [251, 251, 224], "fuzzy": 63.836655, "regressions": [], "measures": {"fuzzy_match_percent": 75.97093, "total_code": "2752", "matched_code": "684", "matched_code_percent": 24.85465, "total_data": "2800", "matched_data": "2800", "matched_data_percent": 100.0, "total_functions": 9, "matched_functions": 6, "matched_functions_percent": 66.66667, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RevoEX/src/net/aes", "function": "AESiDecryptBlock", "label": "inline inverse MixColumns column helper", "compiled": true, "instructions": [249, 251, 241], "fuzzy": 62.84462, "regressions": [], "measures": {"fuzzy_match_percent": 75.60901, "total_code": "2752", "matched_code": "684", "matched_code_percent": 24.85465, "total_data": "2800", "matched_data": "2800", "matched_data_percent": 100.0, "total_functions": 9, "matched_functions": 6, "matched_functions_percent": 66.66667, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RevoEX/src/net/aes", "function": "AESiDecryptBlock", "instructions": [249, 251, 244]}
|
||||
{"event": "begin", "unit": "libs/RevoEX/src/net/aes", "function": "NETAESCreateEx", "origin": "a6c7690eb0e3c8f52487c7e736f3032f35bc5bc4", "remote_source_identical": true, "diagnosis": "Target 108 instructions vs 107. Target recomputes words from saved keyLength after memcpy; ours reuses rounds quotient. Target rotated substitution groups byte16 with byte24 then byte0 with byte8; bitfield transform flag is set before round count update. Try inline context setup and explicit substitution helper boundaries.", "initial": [107, 108, 81], "fuzzy": 88.98148}
|
||||
{"event": "pool", "unit": "libs/RevoEX/src/net/aes", "output": "POOL IDENTICAL up to 4 (mine=4 base=4)\n"}
|
||||
{"event": "attempt", "unit": "libs/RevoEX/src/net/aes", "function": "NETAESCreateEx", "label": "inline AES context setup before key word count computation", "compiled": true, "instructions": [107, 108, 77], "fuzzy": 92.73148, "regressions": [], "measures": {"fuzzy_match_percent": 75.70349, "total_code": "2752", "matched_code": "684", "matched_code_percent": 24.85465, "total_data": "2800", "matched_data": "2800", "matched_data_percent": 100.0, "total_functions": 9, "matched_functions": 6, "matched_functions_percent": 66.66667, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RevoEX/src/net/aes", "function": "NETAESCreateEx", "label": "set transformation bit before round count bitfield", "compiled": true, "instructions": [107, 108, 77], "fuzzy": 92.73148, "regressions": [], "measures": {"fuzzy_match_percent": 75.70349, "total_code": "2752", "matched_code": "684", "matched_code_percent": 24.85465, "total_data": "2800", "matched_data": "2800", "matched_data_percent": 100.0, "total_functions": 9, "matched_functions": 6, "matched_functions_percent": 66.66667, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RevoEX/src/net/aes", "function": "NETAESCreateEx", "label": "rotated key substitution grouped as target high and low pairs", "compiled": true, "instructions": [107, 108, 81], "fuzzy": 83.14815, "regressions": [], "measures": {"fuzzy_match_percent": 74.19913, "total_code": "2752", "matched_code": "684", "matched_code_percent": 24.85465, "total_data": "2800", "matched_data": "2800", "matched_data_percent": 100.0, "total_functions": 9, "matched_functions": 6, "matched_functions_percent": 66.66667, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RevoEX/src/net/aes", "function": "NETAESCreateEx", "instructions": [107, 108, 81]}
|
||||
{"event": "begin", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "origin": "a6c7690eb0e3c8f52487c7e736f3032f35bc5bc4", "remote_source_identical": true, "diagnosis": "Register-only r4/r6 flags-owner exchange persists after setter boundary trials. Try getter inline boundary and modifier setter wrapper; retain only no-regression exact matches.", "initial": [49, 49, 8], "fuzzy": 99.081635}
|
||||
{"event": "pool", "unit": "src/keyboard/tiPcKeyboard", "output": "POOL IDENTICAL up to 204 (mine=204 base=204)\n"}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "modifier getter inline with state reference", "compiled": true, "instructions": [49, 49, 8], "fuzzy": 99.081635, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "modifier getter inline wrapping existing getter", "compiled": true, "instructions": [49, 49, 8], "fuzzy": 99.081635, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "modifier setter inline wrapping real member setter", "compiled": true, "instructions": [49, 49, 8], "fuzzy": 99.081635, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "restored", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "instructions": [49, 49, 8]}
|
||||
{"event": "begin", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "origin": "a6c7690eb0e3c8f52487c7e736f3032f35bc5bc4", "remote_source_identical": true, "diagnosis": "Register-only r4/r6 flags-owner exchange persists after setter boundary trials. Try getter inline boundary and modifier setter wrapper; retain only no-regression exact matches.", "initial": [39, 39, 8], "fuzzy": 98.84615}
|
||||
{"event": "pool", "unit": "src/keyboard/tiPcKeyboard", "output": "POOL IDENTICAL up to 204 (mine=204 base=204)\n"}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "modifier getter inline with state reference", "compiled": true, "instructions": [39, 39, 8], "fuzzy": 98.84615, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "modifier getter inline wrapping existing getter", "compiled": true, "instructions": [39, 39, 8], "fuzzy": 98.84615, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "modifier setter inline wrapping real member setter", "compiled": true, "instructions": [39, 39, 8], "fuzzy": 98.84615, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "restored", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "instructions": [39, 39, 8]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "origin": "a6c7690eb0e3c8f52487c7e736f3032f35bc5bc4", "remote_source_identical": true, "diagnosis": "History loop aligns stores and target compare, leaves 17 differences: phase/depth float scheduling and conversion outputs r7/r6/r5 plus zero r4. Introduce named signed conversion outputs and arithmetic lifetime before declaration search.", "initial": [126, 126, 56], "fuzzy": 69.9127}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "separate signed fixed point conversion results from state stores", "compiled": true, "instructions": [126, 126, 23], "fuzzy": 95.53968, "regressions": [], "measures": {"fuzzy_match_percent": 96.11475, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "compute depth quotient before signed phase and period conversions", "compiled": true, "instructions": [126, 126, 26], "fuzzy": 93.69841, "regressions": [], "measures": {"fuzzy_match_percent": 95.769005, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "compound period scaling with retained quotient operand", "compiled": true, "instructions": [126, 126, 29], "fuzzy": 94.007935, "regressions": [], "measures": {"fuzzy_match_percent": 95.827126, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "instructions": [126, 126, 56]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "origin": "a6c7690eb0e3c8f52487c7e736f3032f35bc5bc4", "remote_source_identical": true, "diagnosis": "Standalone full conversion helper matches, but inline logical callers need fresh diagnosis; compare their changed register assignments before searching local declaration order.", "initial": [51, 51, 16], "fuzzy": 97.84314}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "inspect inline logical callers after standalone wrapper match", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": ["pdm_part_logical_read", "pdm_part_logical_write"], "measures": {"fuzzy_match_percent": 86.588806, "total_code": "3716", "matched_code": "1820", "matched_code_percent": 48.977394, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 16, "matched_functions_percent": 80.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "label": "keep logical read/write out-of-line call boundary proved by target using NO_INLINE", "compiled": true, "instructions": [51, 51, 0], "fuzzy": 100.0, "regressions": [], "measures": {"fuzzy_match_percent": 93.598495, "total_code": "3716", "matched_code": "2276", "matched_code_percent": 61.248653, "matched_data_percent": 100.0, "total_functions": 20, "matched_functions": 18, "matched_functions_percent": 90.0, "complete_data_percent": 100.0, "total_units": 1}}
|
||||
{"event": "accepted", "unit": "libs/RVL_SDK/src/fa/pdm_partition", "function": "pdm_part_chg_ltop", "instructions": [51, 51, 0], "full_gate": "full build: ok\nmain.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d\n[src/keyboard/tiPcKeyboard] pool: IDENTICAL\n[src/keyboard/tiPcKeyboard] objdiff: code 27712/28484 data 18548/18564 functions 138/141 fuzzy 99.9733 linked code 0\n[src/keyboard/tiPcKeyboard] instruction-exact functions: 138/141\n[src/keyboard/tiPcKeyboard] section .bss size 16 match None\n[src/keyboard/tiPcKeyboard] section .ctors size 4 match 100.0\n[src/keyboard/tiPcKeyboard] section .data size 12576 match 100.0\n[src/keyboard/tiPcKeyboard] section .rodata size 5816 match 100.0\n[src/keyboard/tiPcKeyboard] section .sbss size 8 match 100.0\n[src/keyboard/tiPcKeyboard] section .sdata size 136 match 100.0\n[src/keyboard/tiPcKeyboard] section .sdata2 size 8 match 100.0\n[src/keyboard/tiPcKeyboard] section .text size 28484 match 99.97332\n[src/keyboard/tiPcKeyboard] below 100: setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode 99.04762\n[src/keyboard/tiPcKeyboard] below 100: onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb 99.081635\n[src/keyboard/tiPcKeyboard] below 100: onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv 98.84615\n[src/keyboard/tiPcKeyboard] baseline: code 27712/28484 data 18548 functions 138 fuzzy 99.9733\n[libs/RVL_SDK/src/fa/pdm_partition] pool: IDENTICAL\n[libs/RVL_SDK/src/fa/pdm_partition] objdiff: code 2276/3716 data None/None functions 18/20 fuzzy 93.5985 linked code 0\n[libs/RVL_SDK/src/fa/pdm_partition] instruction-exact functions: 18/20\n[libs/RVL_SDK/src/fa/pdm_partition] section .text size 3716 match 93.598495\n[libs/RVL_SDK/src/fa/pdm_partition] below 100: pdm_part_is_master_boot_sector 86.5\n[libs/RVL_SDK/src/fa/pdm_partition] below 100: pdm_part_get_start_sector 82.56159\n[libs/RVL_SDK/src/fa/pdm_partition] baseline: code 2072/3716 data None functions 17 fuzzy 93.4801\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] pool: IDENTICAL\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] objdiff: code 1920/2684 data 48/48 functions 5/7 fuzzy 91.3025 linked code 0\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] instruction-exact functions: 5/7\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] section .sdata2 size 48 match 100.0\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] section .text size 2684 match 91.302536\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] below 100: __InitParams 69.9127\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] below 100: __CalcLFO 68.53846\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] baseline: code 1920/2684 data 48 functions 5 fuzzy 91.3025\n[libs/RevoEX/src/net/aes] pool: IDENTICAL\n[libs/RevoEX/src/net/aes] objdiff: code 684/2752 data 2800/2800 functions 6/9 fuzzy 75.1148 linked code 0\n[libs/RevoEX/src/net/aes] instruction-exact functions: 6/9\n[libs/RevoEX/src/net/aes] section .data size 200 match 100.0\n[libs/RevoEX/src/net/aes] section .rodata size 2592 match 100.0\n[libs/RevoEX/src/net/aes] section .sdata2 size 8 match 100.0\n[libs/RevoEX/src/net/aes] section .text size 2752 match 75.11482\n[libs/RevoEX/src/net/aes] below 100: AESiEncryptBlock 60.348103\n[libs/RevoEX/src/net/aes] below 100: AESiDecryptBlock 61.49004\n[libs/RevoEX/src/net/aes] below 100: NETAESCreateEx 88.98148\n[libs/RevoEX/src/net/aes] baseline: code 684/2752 data 2800 functions 6 fuzzy 75.1148\nregressions vs baseline: 0\nglobal matched_code_percent: 88.09116 -> 88.09798\nglobal fuzzy_match_percent: 99.38004 -> 99.38019\nglobal complete_code_percent: 62.52416 -> 62.52416\nglobal matched_data_percent: 92.11517 -> 92.11517\nforbidden patterns added (net, per file): 0\nreadability warnings (net, per file; must be 0 in the final result): 0\nGATE PASS\n"}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "origin": "f4795462112db607d64efb2a3f78bdb33beffee9", "remote_source_identical": true, "diagnosis": "Partition conversion demonstrated inline public wrapper plus preserved out-of-line call boundary can correct register coloring. Try same legitimate initialization implementation boundary with original validation and repaired history loop.", "initial": [126, 126, 56], "fuzzy": 69.9127}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "discarded", "function": "__InitParams", "reason": "definition-only NO_INLINE too late for earlier callers; wrapper symbol not emitted; no count attributed"}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "instructions": [126, 126, 56]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "origin": "f4795462112db607d64efb2a3f78bdb33beffee9", "remote_source_identical": true, "diagnosis": "Partition conversion demonstrated inline public wrapper plus preserved out-of-line call boundary can correct register coloring. Try same legitimate initialization implementation boundary with original validation and repaired history loop.", "initial": [126, 126, 56], "fuzzy": 69.9127}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "initialization helper with integer state first and history loop", "compiled": true, "instructions": [126, 126, 24], "fuzzy": 97.38095, "regressions": [], "measures": {"fuzzy_match_percent": 96.46051, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "initialization helper with original state order and history loop", "compiled": true, "instructions": [126, 126, 24], "fuzzy": 95.42063, "regressions": [], "measures": {"fuzzy_match_percent": 96.0924, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "initialization helper with signed conversion locals", "compiled": true, "instructions": [126, 126, 24], "fuzzy": 95.42063, "regressions": [], "measures": {"fuzzy_match_percent": 96.0924, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "instructions": [126, 126, 56]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "origin": "f4795462112db607d64efb2a3f78bdb33beffee9", "remote_source_identical": true, "diagnosis": "Closest 17 positional differences follow repaired history loop. Test direct period division instead of pre-folded reciprocal, signed loop indices, and loop helper lifetime, then stop after declaration search if no exact result.", "initial": [126, 126, 56], "fuzzy": 69.9127}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "direct period divided by LFO table length", "compiled": true, "instructions": [126, 126, 16], "fuzzy": 97.81746, "regressions": [], "measures": {"fuzzy_match_percent": 96.54247, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "signed fixed channel and history sample traversal", "compiled": true, "instructions": [126, 126, 16], "fuzzy": 97.81746, "regressions": [], "measures": {"fuzzy_match_percent": 96.54247, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "inline history array loop helper after LFO conversion stores", "compiled": true, "instructions": [126, 126, 16], "fuzzy": 97.81746, "regressions": [], "measures": {"fuzzy_match_percent": 96.54247, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "instructions": [126, 126, 56]}
|
||||
{"event": "begin", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "origin": "f4795462112db607d64efb2a3f78bdb33beffee9", "remote_source_identical": true, "diagnosis": "Structural and helper-boundary attempts exhausted; only flags/owner r4/r6 allocation differs. Run explicit-range declaration search over separately assigned state and flags locals.", "initial": [49, 49, 8], "fuzzy": 99.081635}
|
||||
{"event": "pool", "unit": "src/keyboard/tiPcKeyboard", "output": "POOL IDENTICAL up to 204 (mine=204 base=204)\n"}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "label": "expose assigned modifier state and flags locals for final allocation check", "compiled": true, "instructions": [49, 49, 8], "fuzzy": 99.081635, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "declsearch", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "output": "declaration block:\n Base::KeyState* state;\n u32 flags;\nstart (0, 8)\nbest (0, 8) after 2 builds; source restored; best order was:\n Base::KeyState* state;\n u32 flags;\n"}
|
||||
{"event": "restored", "unit": "src/keyboard/tiPcKeyboard", "function": "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb", "instructions": [49, 49, 8]}
|
||||
{"event": "begin", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "origin": "f4795462112db607d64efb2a3f78bdb33beffee9", "remote_source_identical": true, "diagnosis": "Structural and helper-boundary attempts exhausted; only flags/owner r4/r6 allocation differs. Run explicit-range declaration search over separately assigned state and flags locals.", "initial": [39, 39, 8], "fuzzy": 98.84615}
|
||||
{"event": "pool", "unit": "src/keyboard/tiPcKeyboard", "output": "POOL IDENTICAL up to 204 (mine=204 base=204)\n"}
|
||||
{"event": "attempt", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "label": "expose assigned modifier state and flags locals for final allocation check", "compiled": true, "instructions": [39, 39, 8], "fuzzy": 98.84615, "regressions": [], "measures": {"fuzzy_match_percent": 99.97332, "total_code": "28484", "matched_code": "27712", "matched_code_percent": 97.2897, "total_data": "18564", "matched_data": "18548", "matched_data_percent": 99.91381, "total_functions": 141, "matched_functions": 138, "matched_functions_percent": 97.87234, "total_units": 1}}
|
||||
{"event": "declsearch", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "output": "declaration block:\n Base::KeyState* state;\n u32 flags;\nstart (0, 8)\nbest (0, 8) after 2 builds; source restored; best order was:\n Base::KeyState* state;\n u32 flags;\n"}
|
||||
{"event": "restored", "unit": "src/keyboard/tiPcKeyboard", "function": "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv", "instructions": [39, 39, 8]}
|
||||
{"event": "begin", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "origin": "f4795462112db607d64efb2a3f78bdb33beffee9", "remote_source_identical": true, "diagnosis": "Direct period division removes operand mismatch; remaining 16 differences involve gradient/phase conversion scheduling and zero versus conversion-result GPR allocation. Try named compound phase calculation before independent gradient conversion.", "initial": [126, 126, 56], "fuzzy": 69.9127}
|
||||
{"event": "pool", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "output": "POOL IDENTICAL up to 0 (mine=0 base=0)\n"}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "named compound phase quotient and retained depth quotient", "compiled": true, "instructions": [126, 126, 19], "fuzzy": 96.666664, "regressions": [], "measures": {"fuzzy_match_percent": 96.32638, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "attempt", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "label": "split phase and traversal declarations before allocation search", "compiled": true, "instructions": [126, 126, 19], "fuzzy": 96.666664, "regressions": [], "measures": {"fuzzy_match_percent": 96.32638, "total_code": "2684", "matched_code": "1920", "matched_code_percent": 71.53502, "total_data": "48", "matched_data": "48", "matched_data_percent": 100.0, "total_functions": 7, "matched_functions": 5, "matched_functions_percent": 71.42857, "total_units": 1}}
|
||||
{"event": "declsearch", "function": "__InitParams", "output": "declaration block:\n f32 delay;\n f32 depth;\n f32 step;\n f32 phaseRate;\n u32 channel;\n u32 sample;\nstart (5, 19)\nbest (5, 19) after 36 builds; source restored; best order was:\n f32 delay;\n f32 depth;\n f32 step;\n f32 phaseRate;\n u32 channel;\n u32 sample;\n"}
|
||||
{"event": "restored", "unit": "libs/RVL_SDK/src/axfx/AXFXChorusExp", "function": "__InitParams", "instructions": [126, 126, 56]}
|
||||
{"event": "final_full_gate", "output": "full build: ok\nmain.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d\n[src/keyboard/tiPcKeyboard] pool: IDENTICAL\n[src/keyboard/tiPcKeyboard] objdiff: code 27712/28484 data 18548/18564 functions 138/141 fuzzy 99.9733 linked code 0\n[src/keyboard/tiPcKeyboard] instruction-exact functions: 138/141\n[src/keyboard/tiPcKeyboard] section .bss size 16 match None\n[src/keyboard/tiPcKeyboard] section .ctors size 4 match 100.0\n[src/keyboard/tiPcKeyboard] section .data size 12576 match 100.0\n[src/keyboard/tiPcKeyboard] section .rodata size 5816 match 100.0\n[src/keyboard/tiPcKeyboard] section .sbss size 8 match 100.0\n[src/keyboard/tiPcKeyboard] section .sdata size 136 match 100.0\n[src/keyboard/tiPcKeyboard] section .sdata2 size 8 match 100.0\n[src/keyboard/tiPcKeyboard] section .text size 28484 match 99.97332\n[src/keyboard/tiPcKeyboard] below 100: setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode 99.04762\n[src/keyboard/tiPcKeyboard] below 100: onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb 99.081635\n[src/keyboard/tiPcKeyboard] below 100: onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv 98.84615\n[src/keyboard/tiPcKeyboard] baseline: code 27712/28484 data 18548 functions 138 fuzzy 99.9733\n[libs/RVL_SDK/src/fa/pdm_partition] pool: IDENTICAL\n[libs/RVL_SDK/src/fa/pdm_partition] objdiff: code 2276/3716 data None/None functions 18/20 fuzzy 93.5985 linked code 0\n[libs/RVL_SDK/src/fa/pdm_partition] instruction-exact functions: 18/20\n[libs/RVL_SDK/src/fa/pdm_partition] section .text size 3716 match 93.598495\n[libs/RVL_SDK/src/fa/pdm_partition] below 100: pdm_part_is_master_boot_sector 86.5\n[libs/RVL_SDK/src/fa/pdm_partition] below 100: pdm_part_get_start_sector 82.56159\n[libs/RVL_SDK/src/fa/pdm_partition] baseline: code 2072/3716 data None functions 17 fuzzy 93.4801\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] pool: IDENTICAL\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] objdiff: code 1920/2684 data 48/48 functions 5/7 fuzzy 91.3025 linked code 0\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] instruction-exact functions: 5/7\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] section .sdata2 size 48 match 100.0\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] section .text size 2684 match 91.302536\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] below 100: __InitParams 69.9127\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] below 100: __CalcLFO 68.53846\n[libs/RVL_SDK/src/axfx/AXFXChorusExp] baseline: code 1920/2684 data 48 functions 5 fuzzy 91.3025\n[libs/RevoEX/src/net/aes] pool: IDENTICAL\n[libs/RevoEX/src/net/aes] objdiff: code 684/2752 data 2800/2800 functions 6/9 fuzzy 75.1148 linked code 0\n[libs/RevoEX/src/net/aes] instruction-exact functions: 6/9\n[libs/RevoEX/src/net/aes] section .data size 200 match 100.0\n[libs/RevoEX/src/net/aes] section .rodata size 2592 match 100.0\n[libs/RevoEX/src/net/aes] section .sdata2 size 8 match 100.0\n[libs/RevoEX/src/net/aes] section .text size 2752 match 75.11482\n[libs/RevoEX/src/net/aes] below 100: AESiEncryptBlock 60.348103\n[libs/RevoEX/src/net/aes] below 100: AESiDecryptBlock 61.49004\n[libs/RevoEX/src/net/aes] below 100: NETAESCreateEx 88.98148\n[libs/RevoEX/src/net/aes] baseline: code 684/2752 data 2800 functions 6 fuzzy 75.1148\nregressions vs baseline: 0\nglobal matched_code_percent: 88.09116 -> 88.09798\nglobal fuzzy_match_percent: 99.38004 -> 99.38019\nglobal complete_code_percent: 62.52416 -> 62.52416\nglobal matched_data_percent: 92.11517 -> 92.11517\nforbidden patterns added (net, per file): 0\nreadability warnings (net, per file; must be 0 in the final result): 0\nGATE PASS\n", "compiled_attempts": 85, "attempt_counts": {"setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode": 3, "onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb": 10, "onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv": 10, "pdm_part_is_master_boot_sector": 4, "pdm_part_get_start_sector": 3, "pdm_part_chg_ltop": 13, "__InitParams": 24, "__CalcLFO": 9, "AESiEncryptBlock": 3, "AESiDecryptBlock": 3, "NETAESCreateEx": 3}, "source_commit": "92c886dd"}
|
||||
@@ -1,97 +0,0 @@
|
||||
# Four-unit matching result, 2026-10-02
|
||||
|
||||
Source commit: 92c886dd, match partition sector conversion.
|
||||
|
||||
| Unit | Instruction-exact functions before -> after | Objdiff matched code bytes before -> after | Objdiff matched data bytes before -> after |
|
||||
| --- | --- | --- | --- |
|
||||
| src/keyboard/tiPcKeyboard | 138/141 -> 138/141 | 27712/28484 -> 27712/28484 | 18548/18564 -> 18548/18564 |
|
||||
| libs/RVL_SDK/src/fa/pdm_partition | 17/20 -> 18/20 | 2072/3716 -> 2276/3716 | absent -> absent |
|
||||
| libs/RVL_SDK/src/axfx/AXFXChorusExp | 5/7 -> 5/7 | 1920/2684 -> 1920/2684 | 48/48 -> 48/48 |
|
||||
| libs/RevoEX/src/net/aes | 6/9 -> 6/9 | 684/2752 -> 684/2752 | 2800/2800 -> 2800/2800 |
|
||||
|
||||
## Accepted change
|
||||
|
||||
pdm_part_chg_ltop: 100.0% objdiff, 51/51 instructions, ctxdiff diffs 0. Extracted the unchanged conversion into an inline implementation and kept the public function out of line with NO_INLINE, matching the calls in the target's logical read/write functions. A wrapper without NO_INLINE matched conversion but expanded both callers from 57 to 87 instructions, so that candidate was rejected. Final logical read/write remain exact. Full clean gate has identical pools, zero regressions, zero forbidden patterns, zero readability warnings and the required DOL hash.
|
||||
|
||||
## Remaining functions
|
||||
|
||||
setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode, 99.04762%: 106/105 instructions; defined invalid-enum fallback adds mr r31,r30. Target default appears uninitialized. No undefined fallback introduced.
|
||||
onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb, 99.081635%: 49/49 instructions; flags and owner exchange r4/r6, eight positional differences. Getter/setter boundaries and final explicit declaration search did not resolve allocation.
|
||||
onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv, 98.84615%: 39/39 instructions; flags and owner exchange r4/r6, eight positional differences. Getter/setter boundaries and final explicit declaration search did not resolve allocation.
|
||||
pdm_part_is_master_boot_sector, 86.5%: 86/84 instructions; extra saved register enlarges frame from target 0x30 to 0x40. Endian load scheduling and pointer allocation differ. Helper reduced frame and count, but remained non-exact.
|
||||
pdm_part_get_start_sector, 82.56159%: 276/276 instructions; endian operand association, byte-load scheduling and retained traversal registers differ. Array and success-exit variants remained non-exact.
|
||||
__InitParams, 69.9127%: 126/126 instructions; comparison operand order and floating/state-store scheduling differ. History-loop repair plus direct period division reached 97.81746%, 16 positional differences, but remained non-exact and was restored.
|
||||
__CalcLFO, 68.53846%: 51/65 instructions; missing full signed 64-bit sample/gradient lifetime and CTR loop. Independent compound wide products reached 65/65 instructions, but retained 26 scheduling/allocation differences and were restored.
|
||||
AESiEncryptBlock, 60.348103%: 158/158 instructions; initial state lifetime, table lookup scheduling and XOR associations differ. Three compiled helper/expression/declaration trials remained non-exact.
|
||||
AESiDecryptBlock, 61.49004%: 249/251 instructions; target retains schedule base separately and different inverse MixColumns intermediate lifetimes. Base-pointer trial reached 251/251 but remained non-exact; restored.
|
||||
NETAESCreateEx, 88.98148%: 107/108 instructions; quotient reuse prevents separate key-word recomputation, and substituted-byte association differs. Context initialization boundary reached 92.73148% but remained non-exact; restored.
|
||||
|
||||
## Attempt audit
|
||||
|
||||
85 compiled source attempts across all 11 initially open functions. Every remaining function has at least three distinct compiled source attempts. Declaration-search results and origin/main checks are recorded in sol-high-four-oct2.attempts.jsonl. Every function start fetched origin and compared current source with origin/main. Initial owned sources matched origin/main; subsequent differences were inspected owned experiments. No push, PR, worktree change, shared header change, or configure.py matching-status change.
|
||||
|
||||
## Files changed
|
||||
|
||||
- libs/RVL_SDK/src/fa/pdm_partition.c, committed in 92c886dd.
|
||||
- tools/decomp-assist/sol-high-four-oct2.attempts.jsonl, attempt and validation evidence.
|
||||
- tools/decomp-assist/sol-high-four-oct2.report.md, this report.
|
||||
|
||||
## Uncertainty
|
||||
|
||||
The intended invalid-enum fallback and the exact original LFO/compiler allocation boundaries remain unresolved. No uncertain source experiment was retained.
|
||||
|
||||
## Final full gate, copied verbatim
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiPcKeyboard] pool: IDENTICAL
|
||||
[src/keyboard/tiPcKeyboard] objdiff: code 27712/28484 data 18548/18564 functions 138/141 fuzzy 99.9733 linked code 0
|
||||
[src/keyboard/tiPcKeyboard] instruction-exact functions: 138/141
|
||||
[src/keyboard/tiPcKeyboard] section .bss size 16 match None
|
||||
[src/keyboard/tiPcKeyboard] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .data size 12576 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .rodata size 5816 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .sbss size 8 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .sdata size 136 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .sdata2 size 8 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .text size 28484 match 99.97332
|
||||
[src/keyboard/tiPcKeyboard] below 100: setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode 99.04762
|
||||
[src/keyboard/tiPcKeyboard] below 100: onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb 99.081635
|
||||
[src/keyboard/tiPcKeyboard] below 100: onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv 98.84615
|
||||
[src/keyboard/tiPcKeyboard] baseline: code 27712/28484 data 18548 functions 138 fuzzy 99.9733
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] objdiff: code 2276/3716 data None/None functions 18/20 fuzzy 93.5985 linked code 0
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] instruction-exact functions: 18/20
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] section .text size 3716 match 93.598495
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] below 100: pdm_part_is_master_boot_sector 86.5
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] below 100: pdm_part_get_start_sector 82.56159
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] baseline: code 2072/3716 data None functions 17 fuzzy 93.4801
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] objdiff: code 1920/2684 data 48/48 functions 5/7 fuzzy 91.3025 linked code 0
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] instruction-exact functions: 5/7
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] section .sdata2 size 48 match 100.0
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] section .text size 2684 match 91.302536
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] below 100: __InitParams 69.9127
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] below 100: __CalcLFO 68.53846
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] baseline: code 1920/2684 data 48 functions 5 fuzzy 91.3025
|
||||
[libs/RevoEX/src/net/aes] pool: IDENTICAL
|
||||
[libs/RevoEX/src/net/aes] objdiff: code 684/2752 data 2800/2800 functions 6/9 fuzzy 75.1148 linked code 0
|
||||
[libs/RevoEX/src/net/aes] instruction-exact functions: 6/9
|
||||
[libs/RevoEX/src/net/aes] section .data size 200 match 100.0
|
||||
[libs/RevoEX/src/net/aes] section .rodata size 2592 match 100.0
|
||||
[libs/RevoEX/src/net/aes] section .sdata2 size 8 match 100.0
|
||||
[libs/RevoEX/src/net/aes] section .text size 2752 match 75.11482
|
||||
[libs/RevoEX/src/net/aes] below 100: AESiEncryptBlock 60.348103
|
||||
[libs/RevoEX/src/net/aes] below 100: AESiDecryptBlock 61.49004
|
||||
[libs/RevoEX/src/net/aes] below 100: NETAESCreateEx 88.98148
|
||||
[libs/RevoEX/src/net/aes] baseline: code 684/2752 data 2800 functions 6 fuzzy 75.1148
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 88.09116 -> 88.09798
|
||||
global fuzzy_match_percent: 99.38004 -> 99.38019
|
||||
global complete_code_percent: 62.52416 -> 62.52416
|
||||
global matched_data_percent: 92.11517 -> 92.11517
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
@@ -1,422 +0,0 @@
|
||||
# Four-unit matching attempts
|
||||
|
||||
Baseline measured live, not copied from task estimates. Only instruction-exact improvements retained. Failed compiler experiments do not count toward the three-attempt requirement.
|
||||
|
||||
## getControlKey__Q49textinput8keyboard6pctype4BaseFPc
|
||||
Origin 30e1ef09380cb59719dcfbd2c00c52ca16473946, source identical
|
||||
Diagnosis: 36/36 instructions; counter and element offset exchange r30/r31, prologue initialization moves. No branch or frame difference.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (36, 36, 8)
|
||||
1. bind the selected control by reference before comparison: (34, 36, 23) objdiff 88.02778 pool/regression/scan PASS reverted
|
||||
2. declare the traversal index in function scope: (36, 36, 8) objdiff 93.333336 pool/regression/scan PASS reverted
|
||||
3. use a do while traversal preserving 16 bit index: compile failed /src/keyboard/tiPcKeyboard.d
|
||||
Final restored (36, 36, 8)
|
||||
Origin 30e1ef09380cb59719dcfbd2c00c52ca16473946, source identical
|
||||
Diagnosis: Counter and offset coloring remains; try loop induction form after scoped-index and reference trials.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (36, 36, 8)
|
||||
1. do while with preincremented 16 bit traversal index: (37, 36, 20) objdiff 90.55556 pool/regression/scan PASS reverted
|
||||
Final restored (36, 36, 8)
|
||||
Origin edfb253724595e3a6487d03a669d4a521f781e1d, source identical
|
||||
Diagnosis: Register-only result after three loop/reference experiments. Test genuine inline key-state lookup boundary then declaration ordering.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (36, 36, 8)
|
||||
1. inline control lookup with explicit key-state argument: compile failed ---------------------
|
||||
Final restored (36, 36, 8)
|
||||
Origin 17407ed1cbfa5f7f43ebd141902ceea0c73a1e64, source identical
|
||||
Diagnosis: Register-only induction/element offset mismatch; name the widened control index so its declaration participates in real allocation.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (36, 36, 8)
|
||||
1. explicit widened control index before traversal counter: (36, 36, 8) objdiff 93.333336 pool/regression/scan PASS reverted
|
||||
start (2, 8)
|
||||
best (2, 8) after 2 builds; source restored; best order was:
|
||||
Final restored (36, 36, 8)
|
||||
Origin a81b7c36fe25993fac3ad2a3009f16839aed40ec, source identical
|
||||
Diagnosis: Register-only result after three loop/reference experiments. Test genuine inline key-state lookup boundary then declaration ordering.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (36, 36, 8)
|
||||
1. inline control lookup with explicit key-state argument: (36, 36, 0) objdiff 100 pool/regression/scan PASS retained for further trials
|
||||
regressions vs baseline: 0
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
[agent/w1002/near7 21811470] match base::getcontrolkey
|
||||
|
||||
## setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode
|
||||
Origin 30e1ef09380cb59719dcfbd2c00c52ca16473946, source identical
|
||||
Diagnosis: 106/105; only extra mr r31,r30 initializes defined enum fallback. Target default-path value is not initialized. Keep defined behavior; test equivalent mappings.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (106, 105, 99)
|
||||
1. select key mode with conditional expressions: (117, 105, 109) objdiff 88.46667 pool/regression/scan PASS reverted
|
||||
2. reuse mode as direct numeric key mode: (88, 105, 100) objdiff 82.685715 pool/regression/scan FAIL reverted
|
||||
3. signed intermediate enum mapping: (106, 105, 99) objdiff 99.04762 pool/regression/scan PASS reverted
|
||||
Final restored (106, 105, 99)
|
||||
|
||||
## onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb
|
||||
Origin 30e1ef09380cb59719dcfbd2c00c52ca16473946, source identical
|
||||
Diagnosis: 49/49; inline setABCFlag owner and flags exchange r4/r6. Branches, stack and instruction schedule otherwise identical.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (49, 49, 8)
|
||||
1. bind the key state pointer before querying flags: (49, 49, 8) objdiff 99.081635 pool/regression/scan PASS reverted
|
||||
2. pass modifier combination directly into setter: (49, 49, 9) objdiff 99.081635 pool/regression/scan FAIL reverted
|
||||
3. separate flags declaration and getter assignment: (49, 49, 8) objdiff 99.081635 pool/regression/scan PASS reverted
|
||||
Final restored (49, 49, 8)
|
||||
Origin edfb253724595e3a6487d03a669d4a521f781e1d, source identical
|
||||
Diagnosis: Try actual setter owner load lifetime; standalone setter and every caller remain protected by gate regression check.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (49, 49, 8)
|
||||
1. load owner after updating flags in real setter: (49, 49, 8) objdiff 99.081635 pool/regression/scan PASS reverted
|
||||
Final restored (49, 49, 8)
|
||||
Origin a81b7c36fe25993fac3ad2a3009f16839aed40ec, source identical
|
||||
Diagnosis: After three structural/helper/lifetime attempts, expose state pointer and flags as separately assigned locals for safe declaration search. Every local assigned before use.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (49, 49, 8)
|
||||
2. put final round key before substituted bytes: (249, 251, 244) objdiff 61.49004 pool/regression/scan PASS reverted
|
||||
Final restored (249, 251, 244)
|
||||
fewer than two leading declarations; pass --lines START END
|
||||
Final restored (49, 49, 8)
|
||||
Origin a81b7c36fe25993fac3ad2a3009f16839aed40ec, source differs; inspected below
|
||||
Diagnosis: After three structural/helper/lifetime attempts, expose state pointer and flags as separately assigned locals for safe declaration search. Every local assigned before use.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (49, 49, 8)
|
||||
start (0, 8)
|
||||
best (0, 8) after 2 builds; source restored; best order was:
|
||||
Final restored (49, 49, 8)
|
||||
Origin a81b7c36fe25993fac3ad2a3009f16839aed40ec, source differs; inspected below
|
||||
Diagnosis: Structural branches and instructions identical, inline helper boundary changed control lookup coloring exactly. Try real shared shift-modifier operation boundary for both pressed and released events.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (49, 49, 8)
|
||||
1. inline shared shift modifier operation with state first: (49, 49, 11) objdiff 98.77551 pool/regression/scan PASS reverted
|
||||
2. inline shared shift modifier operation with enable flag first: (49, 49, 11) objdiff 98.77551 pool/regression/scan PASS reverted
|
||||
Final restored (49, 49, 8)
|
||||
|
||||
## onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv
|
||||
Origin 30e1ef09380cb59719dcfbd2c00c52ca16473946, source identical
|
||||
Diagnosis: 39/39; inline owner and flags exchange r4/r6 only.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (39, 39, 8)
|
||||
1. bind the key state pointer before querying flags: (39, 39, 8) objdiff 98.84615 pool/regression/scan PASS reverted
|
||||
2. pass modifier combination directly into setter: (39, 39, 13) objdiff 92.30769 pool/regression/scan FAIL reverted
|
||||
3. separate flags declaration and getter assignment: (39, 39, 8) objdiff 98.84615 pool/regression/scan PASS reverted
|
||||
Final restored (39, 39, 8)
|
||||
Origin a81b7c36fe25993fac3ad2a3009f16839aed40ec, source identical
|
||||
Diagnosis: After three structural/helper/lifetime attempts, expose state pointer and flags as separately assigned locals for safe declaration search. Every local assigned before use.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (39, 39, 8)
|
||||
fewer than two leading declarations; pass --lines START END
|
||||
Final restored (39, 39, 8)
|
||||
Origin a81b7c36fe25993fac3ad2a3009f16839aed40ec, source differs; inspected below
|
||||
Diagnosis: After three structural/helper/lifetime attempts, expose state pointer and flags as separately assigned locals for safe declaration search. Every local assigned before use.
|
||||
POOL IDENTICAL up to 204 (mine=204 base=204)
|
||||
Initial (39, 39, 8)
|
||||
start (0, 8)
|
||||
best (0, 8) after 2 builds; source restored; best order was:
|
||||
Final restored (39, 39, 8)
|
||||
|
||||
## AXFXChorusExpShutdown
|
||||
Origin c1cccf1c2c9ef6531a5f914c1e67b7032dbbc273, source identical
|
||||
Diagnosis: 36/36; fx and channel exchange r29/r30, identical frame/branches. Test helper boundary before declaration coloring.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (36, 36, 5)
|
||||
1. declare channel before interrupt enabled: (36, 36, 0) objdiff 100 pool/regression/scan FAIL reverted
|
||||
2. split enabled declaration and assignment: compile failed DK/src/axfx/AXFXChorusExp.d
|
||||
3. use signed channel traversal: (36, 36, 5) objdiff 97.638885 pool/regression/scan FAIL reverted
|
||||
Final restored (36, 36, 5)
|
||||
Origin f095c9ea12ecefe57174107f9d1cb93ba6ebe1cf, source differs; inspected below
|
||||
Diagnosis: Register-only loop mismatch after declaration/lifetime trials; use real delay-line freeing inline helper corresponding to allocation/bzero helpers.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (36, 36, 5)
|
||||
1. inline delay line deallocation helper: (36, 36, 0) objdiff 100 pool/regression/scan PASS retained for further trials
|
||||
regressions vs baseline: 0
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
[agent/w1002/near7 c10cacbe] match axfxchorusexpshutdown
|
||||
|
||||
## AXFXChorusExpCallback
|
||||
Origin c1cccf1c2c9ef6531a5f914c1e67b7032dbbc273, source identical
|
||||
Diagnosis: 216/216; input/output array stack offsets reversed, history induction updates and whole decrement scheduled differently, interpolation float accumulation differs. Fix structural operations before coloring.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (216, 216, 70)
|
||||
1. declare input before output to match stack arrays: (216, 216, 74) objdiff 89.12037 pool/regression/scan PASS reverted
|
||||
2. decrement remaining history samples before source wrap: (216, 216, 63) objdiff 89.15741 pool/regression/scan PASS retained for further trials
|
||||
3. separate history increment from index masking: (216, 216, 11) objdiff 99.64352 pool/regression/scan PASS retained for further trials
|
||||
Final restored (216, 216, 70)
|
||||
Origin e5f4e0e1f4b38e8ac2f461523b2cb26ede5210f4, source identical
|
||||
Diagnosis: Prior structural trials reduced 70 diffs to 11. Retain separate history increments and earlier whole decrement; then inspect arrays/induction coloring.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (216, 216, 70)
|
||||
1. restore separate increments and decrement before wrap: (216, 216, 11) objdiff 99.64352 pool/regression/scan PASS retained for further trials
|
||||
2. exchange input and output array declarations after loop repairs: (216, 216, 15) objdiff 99.625 pool/regression/scan PASS reverted
|
||||
3. declare retained history index before fractional source indices: (216, 216, 11) objdiff 99.64352 pool/regression/scan PASS reverted
|
||||
Final restored (216, 216, 70)
|
||||
Origin fed31b69b6e31473842c24734915f62f8466a84f, source identical
|
||||
Diagnosis: 11 remaining differences after loop fix are input/output expression operand order and stack pointer register allocation.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (216, 216, 70)
|
||||
1. separate history increments and decrement before wrap: (216, 216, 11) objdiff 99.64352 pool/regression/scan PASS retained for further trials
|
||||
2. read output before incremented bus input in dry addition: (216, 216, 0) objdiff 100 pool/regression/scan PASS retained for further trials
|
||||
regressions vs baseline: 0
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
[agent/w1002/near7 6cc459c4] match axfxchorusexpcallback
|
||||
|
||||
## __InitParams
|
||||
Origin c1cccf1c2c9ef6531a5f914c1e67b7032dbbc273, source identical
|
||||
Diagnosis: 126/126; comparison reversed and independent integer resets, floating conversions and history stores reorder. Conversion locals needed before data stores; no inline helper boundary mismatch.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (126, 126, 56)
|
||||
Origin c1cccf1c2c9ef6531a5f914c1e67b7032dbbc273, source identical
|
||||
Diagnosis: 126/126; comparison reversed and independent integer resets, floating conversions and history stores reorder. Conversion locals needed before data stores; no inline helper boundary mismatch.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (126, 126, 56)
|
||||
1. compare depth against delay in target operand order: (126, 126, 55) objdiff 69.992065 pool/regression/scan PASS retained for further trials
|
||||
2. compute all signed LFO conversions in locals before state stores: (126, 126, 55) objdiff 69.75397 pool/regression/scan PASS reverted
|
||||
3. multiply depth on left of fixed point scale: (126, 126, 55) objdiff 69.992065 pool/regression/scan PASS reverted
|
||||
Final restored (126, 126, 56)
|
||||
Origin 0d75b24a9634b51dd5a74eb4d7ce09dea02d681b, source differs; inspected below
|
||||
Diagnosis: Move integer state initialization ahead of arithmetic conversions so history stores no longer interleave. Same constants and operation associations as original.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (126, 126, 56)
|
||||
1. initialize integer LFO state before conversion stores: (126, 126, 55) objdiff 69.79365 pool/regression/scan PASS retained for further trials
|
||||
2. depth on left in saturation comparison: (126, 126, 54) objdiff 69.87302 pool/regression/scan PASS retained for further trials
|
||||
3. compute period step before phase and depth conversions: (126, 126, 55) objdiff 69.11905 pool/regression/scan FAIL reverted
|
||||
Final restored (126, 126, 56)
|
||||
Origin d17ab22bf0394165d00ce90513e36b576ee05d94, source differs; inspected below
|
||||
Diagnosis: Try natural inline history clearing helper to establish arithmetic boundary matching target history stores after all conversion stores.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (126, 126, 56)
|
||||
1. inline history clearing boundary after LFO conversion stores: (126, 126, 56) objdiff 69.9127 pool/regression/scan PASS reverted
|
||||
Final restored (126, 126, 56)
|
||||
|
||||
## __CalcLFO
|
||||
Origin c1cccf1c2c9ef6531a5f914c1e67b7032dbbc273, source identical
|
||||
Diagnosis: 65 target; target retains signed 64 bit shifted sample and negation carry, ours manually assembles low word. Target unsigned sign >=1. Restore arithmetic width first.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (51, 65, 65)
|
||||
1. use signed 64 bit shifts and retained sample value: (54, 65, 65) objdiff 61.46154 pool/regression/scan PASS retained for further trials
|
||||
2. test unsigned LFO sign against one: (54, 65, 65) objdiff 62.384617 pool/regression/scan PASS reverted
|
||||
3. widen accumulated last sample before gradient addition: (54, 65, 65) objdiff 61.46154 pool/regression/scan PASS reverted
|
||||
Final restored (51, 65, 65)
|
||||
Origin 0d75b24a9634b51dd5a74eb4d7ce09dea02d681b, source differs; inspected below
|
||||
Diagnosis: Target gradient multiply expands 64-bit difference operand, sample shift/negation remain 64-bit. Target uses fixed-count CTR loop.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (51, 65, 65)
|
||||
1. retain 64 bit gradient difference and signed sample with sign threshold: (54, 65, 65) objdiff 62.384617 pool/regression/scan PASS retained for further trials
|
||||
2. fixed-count ascending for loop: (55, 65, 65) objdiff 72.0 pool/regression/scan PASS retained for further trials
|
||||
3. name gradient product independently before shifted store: (55, 65, 65) objdiff 72.0 pool/regression/scan PASS reverted
|
||||
Final restored (51, 65, 65)
|
||||
Origin d17ab22bf0394165d00ce90513e36b576ee05d94, source differs; inspected below
|
||||
Diagnosis: Try compound assignment preserving signed 64-bit multiplication intermediate instead of direct product expression, with fixed-count CTR loop.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (51, 65, 65)
|
||||
1. compound 64 bit gradient multiplication with signed output: (61, 65, 65) objdiff 62.29231 pool/regression/scan PASS retained for further trials
|
||||
Final restored (51, 65, 65)
|
||||
|
||||
## pdm_part_is_master_boot_sector
|
||||
Origin d9fbf88fb8fcce715fab661f1fe8be49f007efcd, source identical
|
||||
Diagnosis: 86/84; frame 64 vs 48 saves extra r29 from endian load association. Target start/count pointers r6/r7 and index r8. Target high byte loaded before middle byte, addition pair layout remains meaningful.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (86, 84, 84)
|
||||
1. evaluate high byte pair before low byte pair: (86, 84, 85) objdiff 82.27381 pool/regression/scan PASS reverted
|
||||
2. group little endian words as independent low and high halves: (86, 84, 85) objdiff 86.38095 pool/regression/scan PASS reverted
|
||||
3. initialize traversal pointers at declaration after signature validation: compile failed /pdm_partition.d
|
||||
Final restored (86, 84, 84)
|
||||
Origin c8bb9f44da1ea63d0dad0a388957bcb5a4150fab, source identical
|
||||
Diagnosis: Third compiling structural trial: high/middle byte loads ordered by named scalar parts; target saves one fewer callee register.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (86, 84, 84)
|
||||
1. name high and low byte pairs before stores: (83, 84, 76) objdiff 81.34524 pool/regression/scan PASS retained for further trials
|
||||
Final restored (86, 84, 84)
|
||||
Origin d17ab22bf0394165d00ce90513e36b576ee05d94, source identical
|
||||
Diagnosis: Named endian halves reduced frame/instruction count; preliminary start store must precede remaining buffer reads to preserve target alias dependency.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (86, 84, 84)
|
||||
1. retain preliminary start store before count byte loads: (84, 84, 36) objdiff 86.95238 pool/regression/scan PASS retained for further trials
|
||||
2. evaluate low start half before high start half: (84, 84, 36) objdiff 86.75 pool/regression/scan PASS reverted
|
||||
start (27, 36)
|
||||
improved (27, 34)
|
||||
improved (27, 33)
|
||||
improved (27, 32)
|
||||
improved (27, 26)
|
||||
best (27, 26) after 33 builds; kept in source:
|
||||
Final restored (86, 84, 84)
|
||||
|
||||
## pdm_part_get_start_sector
|
||||
Origin d9fbf88fb8fcce715fab661f1fe8be49f007efcd, source identical
|
||||
Diagnosis: 276/276; endian macro operand association and load scheduling differ, preserved frame and control flow. Target reads middle bytes of several partitions first; grouping words affects scheduler.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (276, 276, 146)
|
||||
1. use grouped high and low half endian addition at call sites: (276, 276, 140) objdiff 83.10507 pool/regression/scan PASS retained for further trials
|
||||
2. interleave start and length array initialization by partition: (276, 276, 145) objdiff 83.065216 pool/regression/scan PASS reverted
|
||||
3. separate requested partition declaration from member load: (276, 276, 140) objdiff 83.10507 pool/regression/scan PASS reverted
|
||||
Final restored (276, 276, 146)
|
||||
|
||||
## pdm_part_chg_ltop
|
||||
Origin d9fbf88fb8fcce715fab661f1fe8be49f007efcd, source identical
|
||||
Diagnosis: 51/51; ratio and adjusted start exchange r0/r3 only. No structural differences. Try ratio lifetime/width then declaration search.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (51, 51, 16)
|
||||
1. load media ratio before start sector: (51, 51, 16) objdiff 97.84314 pool/regression/scan PASS reverted
|
||||
2. use separate logical and physical sector ratios: compile failed
|
||||
3. commute the final logical-sector addition: (51, 51, 16) objdiff 97.745094 pool/regression/scan PASS reverted
|
||||
Final restored (51, 51, 16)
|
||||
Origin c8bb9f44da1ea63d0dad0a388957bcb5a4150fab, source identical
|
||||
Diagnosis: Third compiling variation separates logical ratio lifetime with leading C declarations.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (51, 51, 16)
|
||||
1. separate leading declaration for logical ratio: (51, 51, 16) objdiff 97.84314 pool/regression/scan PASS reverted
|
||||
Register-only declaration search
|
||||
Final restored (51, 51, 16)
|
||||
Origin 17407ed1cbfa5f7f43ebd141902ceea0c73a1e64, source identical
|
||||
Diagnosis: Structural source attempts exhausted; use declaration permutation search for remaining r0/r3 assignment.
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Initial (51, 51, 16)
|
||||
Register-only declaration search
|
||||
start (0, 16)
|
||||
best (0, 16) after 6 builds; source restored; best order was:
|
||||
Final restored (51, 51, 16)
|
||||
|
||||
## AESiEncryptBlock
|
||||
Origin 0d75b24a9634b51dd5a74eb4d7ce09dea02d681b, source identical
|
||||
Diagnosis: 158/158; same 64-byte frame, four-word round and decrement branch. Target associates byte3/byte2 then byte1 then byte0 and round key; ours schedules final byte with byte1 separately. Operand association and local lifetime first.
|
||||
POOL IDENTICAL up to 4 (mine=4 base=4)
|
||||
Initial (158, 158, 134)
|
||||
1. combine each round key into its corresponding next-word temporary: (158, 158, 137) objdiff 52.829113 pool/regression/scan PASS reverted
|
||||
2. group each round lookup into high and low byte pairs: (158, 158, 134) objdiff 60.348103 pool/regression/scan PASS reverted
|
||||
3. declare all next state words before round expressions: (158, 158, 134) objdiff 60.348103 pool/regression/scan PASS reverted
|
||||
Final restored (158, 158, 134)
|
||||
Origin a81b7c36fe25993fac3ad2a3009f16839aed40ec, source identical
|
||||
Diagnosis: Round key first XOR association and final substitution key-first association follow target merge order. Prior structural variants unchanged or regressed; these move operand roots.
|
||||
POOL IDENTICAL up to 4 (mine=4 base=4)
|
||||
Initial (158, 158, 134)
|
||||
1. put round key at the XOR expression root: (158, 158, 137) objdiff 52.829113 pool/regression/scan PASS reverted
|
||||
2. put final round key before substituted bytes: (158, 158, 134) objdiff 60.348103 pool/regression/scan PASS reverted
|
||||
Final restored (158, 158, 134)
|
||||
|
||||
## AESiDecryptBlock
|
||||
Origin 0d75b24a9634b51dd5a74eb4d7ce09dea02d681b, source identical
|
||||
Diagnosis: 251 target; two-word unrolled key transform and same round frame. Target mix algebra uses successive xor-and-rotate stages; ours equivalent association changes scheduling. Round lookup differs as encryption.
|
||||
POOL IDENTICAL up to 4 (mine=4 base=4)
|
||||
Initial (249, 251, 244)
|
||||
1. combine each round key into its corresponding next-word temporary: (249, 251, 244) objdiff 62.063744 pool/regression/scan PASS reverted
|
||||
2. group each round lookup into high and low byte pairs: (249, 251, 244) objdiff 61.49004 pool/regression/scan PASS reverted
|
||||
3. declare all next state words before round expressions: (249, 251, 244) objdiff 61.49004 pool/regression/scan PASS reverted
|
||||
Final restored (249, 251, 244)
|
||||
Origin a81b7c36fe25993fac3ad2a3009f16839aed40ec, source identical
|
||||
Diagnosis: Round key first XOR association and final substitution key-first association follow target merge order. Prior structural variants unchanged or regressed; these move operand roots.
|
||||
POOL IDENTICAL up to 4 (mine=4 base=4)
|
||||
Initial (249, 251, 244)
|
||||
1. put round key at the XOR expression root: (249, 251, 244) objdiff 62.063744 pool/regression/scan PASS reverted
|
||||
|
||||
## NETAESCreateEx
|
||||
Origin 0d75b24a9634b51dd5a74eb4d7ce09dea02d681b, source identical
|
||||
Diagnosis: 107/108; target key word count recomputed after memcpy from saved keyLength; target rotate-substitute bytes associated in a different operand order. Independent declaration/operation lifetime first.
|
||||
POOL IDENTICAL up to 4 (mine=4 base=4)
|
||||
Initial (107, 108, 81)
|
||||
1. compute schedule word count after memcpy: (107, 108, 81) objdiff 88.98148 pool/regression/scan PASS reverted
|
||||
2. substitute rotated key bytes explicitly in target operand order: (107, 108, 81) objdiff 90.18519 pool/regression/scan PASS reverted
|
||||
3. declare schedule before key expansion scalars: (107, 108, 81) objdiff 88.98148 pool/regression/scan PASS reverted
|
||||
Final restored (107, 108, 81)
|
||||
Origin a81b7c36fe25993fac3ad2a3009f16839aed40ec, source identical
|
||||
Diagnosis: Target round count truncates to 8-bit before context store, then separately computes untruncated word count after memcpy. Factor the derived round count into typed temporary to avoid reused division.
|
||||
POOL IDENTICAL up to 4 (mine=4 base=4)
|
||||
Initial (107, 108, 81)
|
||||
1. use 8 bit round count before context store: (107, 108, 81) objdiff 88.98148 pool/regression/scan PASS reverted
|
||||
2. initialize word count independently after retaining context round count: (114, 108, 111) objdiff 72.99074 pool/regression/scan PASS reverted
|
||||
3. use signed key word count matching SDK length domain: (107, 108, 81) objdiff 88.47222 pool/regression/scan PASS reverted
|
||||
Final restored (107, 108, 81)
|
||||
|
||||
## Final open-function audit
|
||||
setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode: 99.04762%, 3 compiling source trials; one extra move initializes the defined fallback; target default path appears uninitialized, preserved defined behavior.
|
||||
onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb: 99.081635%, 7 compiling source trials; inline setter flags and owner registers r4/r6 exchanged after structural and declaration trials.
|
||||
onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv: 98.84615%, 3 compiling source trials; inline setter flags and owner registers r4/r6 exchanged after structural and declaration trials.
|
||||
pdm_part_is_master_boot_sector: 86.5%, 5 compiling source trials; endian byte-load association changes frame and saved registers; staged loads can fix frame but not schedule.
|
||||
pdm_part_get_start_sector: 82.56159%, 3 compiling source trials; endian extraction load schedule and scalar register allocation.
|
||||
pdm_part_chg_ltop: 97.84314%, 3 compiling source trials; ratio/start r0/r3 exchange; declsearch six orders unchanged.
|
||||
__InitParams: 69.9127%, 7 compiling source trials; floating scheduling, compare operand order and state-store scheduling; 126 instructions each.
|
||||
__CalcLFO: 68.53846%, 7 compiling source trials; signed 64-bit gradient multiplication boundary, shifted sample lifetime and loop scheduling.
|
||||
AESiEncryptBlock: 60.348103%, 5 compiling source trials; round lookup/XOR operand association and temporary lifetimes; 158 instructions each.
|
||||
AESiDecryptBlock: 61.49004%, 4 compiling source trials; key-transform algebra scheduling and round lookup/XOR operand association; 249 versus 251 instructions.
|
||||
NETAESCreateEx: 88.98148%, 6 compiling source trials; derived word-count lifetime and key-substitution operand scheduling; 107 versus 108 instructions.
|
||||
|
||||
## Accepted instruction-exact results
|
||||
getControlKey__Q49textinput8keyboard6pctype4BaseFPc
|
||||
src 0x90 base 0x90 insns 36/36
|
||||
diffs 0: []
|
||||
AXFXChorusExpCallback
|
||||
src 0x360 base 0x360 insns 216/216
|
||||
diffs 0: []
|
||||
AXFXChorusExpShutdown
|
||||
src 0x90 base 0x90 insns 36/36
|
||||
diffs 0: []
|
||||
|
||||
## Before -> after, instruction exact / matched code bytes / matched data bytes
|
||||
tiPcKeyboard: 137/141 -> 138/141; 27568 -> 27712; 18548 -> 18548
|
||||
pdm_partition: 17/20 -> 17/20; 2072 -> 2072; no data section
|
||||
AXFXChorusExp: 3/7 -> 5/7; 912 -> 1920; 48 -> 48
|
||||
aes: 6/9 -> 6/9; 684 -> 684; 2800 -> 2800
|
||||
|
||||
## Final full gate, all four units
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiPcKeyboard] pool: IDENTICAL
|
||||
[src/keyboard/tiPcKeyboard] objdiff: code 27712/28484 data 18548/18564 functions 138/141 fuzzy 99.9733 linked code 0
|
||||
[src/keyboard/tiPcKeyboard] instruction-exact functions: 138/141
|
||||
[src/keyboard/tiPcKeyboard] section .bss size 16 match None
|
||||
[src/keyboard/tiPcKeyboard] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .data size 12576 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .rodata size 5816 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .sbss size 8 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .sdata size 136 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .sdata2 size 8 match 100.0
|
||||
[src/keyboard/tiPcKeyboard] section .text size 28484 match 99.97332
|
||||
[src/keyboard/tiPcKeyboard] below 100: setTranslateMode__Q49textinput8keyboard6pctype4BaseFQ59textinput8keyboard6pctype4Base13TranslateMode 99.04762
|
||||
[src/keyboard/tiPcKeyboard] below 100: onPressedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFb 99.081635
|
||||
[src/keyboard/tiPcKeyboard] below 100: onReleasedShift__Q49textinput8keyboard6pctype12LayoutByNW4RFv 98.84615
|
||||
[src/keyboard/tiPcKeyboard] baseline: code 27568/28484 data 18548 functions 137 fuzzy 99.9396
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] objdiff: code 2072/3716 data None/None functions 17/20 fuzzy 93.4801 linked code 0
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] instruction-exact functions: 17/20
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] section .text size 3716 match 93.48009
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] below 100: pdm_part_is_master_boot_sector 86.5
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] below 100: pdm_part_get_start_sector 82.56159
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] below 100: pdm_part_chg_ltop 97.84314
|
||||
[libs/RVL_SDK/src/fa/pdm_partition] baseline: code 2072/3716 data None functions 17 fuzzy 93.4801
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] objdiff: code 1920/2684 data 48/48 functions 5/7 fuzzy 91.3025 linked code 0
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] instruction-exact functions: 5/7
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] section .sdata2 size 48 match 100.0
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] section .text size 2684 match 91.302536
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] below 100: __InitParams 69.9127
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] below 100: __CalcLFO 68.53846
|
||||
[libs/RVL_SDK/src/axfx/AXFXChorusExp] baseline: code 912/2684 data 48 functions 3 fuzzy 87.7615
|
||||
[libs/RevoEX/src/net/aes] pool: IDENTICAL
|
||||
[libs/RevoEX/src/net/aes] objdiff: code 684/2752 data 2800/2800 functions 6/9 fuzzy 75.1148 linked code 0
|
||||
[libs/RevoEX/src/net/aes] instruction-exact functions: 6/9
|
||||
[libs/RevoEX/src/net/aes] section .data size 200 match 100.0
|
||||
[libs/RevoEX/src/net/aes] section .rodata size 2592 match 100.0
|
||||
[libs/RevoEX/src/net/aes] section .sdata2 size 8 match 100.0
|
||||
[libs/RevoEX/src/net/aes] section .text size 2752 match 75.11482
|
||||
[libs/RevoEX/src/net/aes] below 100: AESiEncryptBlock 60.348103
|
||||
[libs/RevoEX/src/net/aes] below 100: AESiDecryptBlock 61.49004
|
||||
[libs/RevoEX/src/net/aes] below 100: NETAESCreateEx 88.98148
|
||||
[libs/RevoEX/src/net/aes] baseline: code 684/2752 data 2800 functions 6 fuzzy 75.1148
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 87.99755 -> 88.03601
|
||||
global fuzzy_match_percent: 99.37608 -> 99.37956
|
||||
global complete_code_percent: 62.37071 -> 62.37071
|
||||
global matched_data_percent: 92.06847 -> 92.06847
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
|
||||
|
||||
## Source commits
|
||||
6cc459c4 match axfxchorusexpcallback
|
||||
c10cacbe match axfxchorusexpshutdown
|
||||
21811470 match base::getcontrolkey
|
||||
|
||||
## Uncertainty
|
||||
The enum default path appears uninitialized in the target; no undefined fallback was introduced. The exact LFO source boundary responsible for its expanded 64-bit gradient multiplication remains unresolved.
|
||||
@@ -144,55 +144,6 @@ class JumpTableTests(unittest.TestCase):
|
||||
with self.assertRaisesRegex(ValueError, "does not target"):
|
||||
tool.reference_tables(reference, reference.symbol("dispatch"), "jumptable_test")
|
||||
|
||||
def test_discovers_compiler_and_custom_names(self):
|
||||
for name in ("@123", "scCharacterDispatch"):
|
||||
reference = fixture()
|
||||
reference.symbols[1] = replace(reference.symbols[1], name=name)
|
||||
tables = tool.reference_tables(reference, reference.symbol("dispatch"))
|
||||
self.assertEqual([(t.name, entries) for t, entries in tables],
|
||||
[(name, [0x10, 0x20, 0x30])])
|
||||
|
||||
def test_custom_table_can_include_function_entry(self):
|
||||
reference = fixture((0, 0x10, 0x20), source=True)
|
||||
tables = tool.reference_tables(reference, reference.symbol("dispatch"))
|
||||
self.assertEqual(tables[0][1], [0, 0x10, 0x20])
|
||||
|
||||
def test_function_entry_callback_array_is_not_auto_selected(self):
|
||||
reference = fixture((0, 0, 0), source=True)
|
||||
fn = reference.symbol("dispatch")
|
||||
self.assertEqual(tool.reference_tables(reference, fn), [])
|
||||
self.assertEqual(tool.reference_tables(reference, fn, "@123")[0][1],
|
||||
[0, 0, 0])
|
||||
|
||||
def test_single_pointer_requires_explicit_name(self):
|
||||
reference = fixture((0x10,), source=True)
|
||||
fn = reference.symbol("dispatch")
|
||||
self.assertEqual(tool.reference_tables(reference, fn), [])
|
||||
self.assertEqual(tool.reference_tables(reference, fn, "@123")[0][1], [0x10])
|
||||
|
||||
def test_custom_table_requires_data_object(self):
|
||||
reference = fixture(source=True)
|
||||
reference.symbols[1] = replace(reference.symbols[1], kind="STT_NOTYPE")
|
||||
self.assertEqual(tool.reference_tables(reference, reference.symbol("dispatch")), [])
|
||||
reference.symbols[1] = replace(reference.symbols[1], kind="STT_OBJECT")
|
||||
reference.sections[2] = (".text", 0x1000)
|
||||
self.assertEqual(tool.reference_tables(reference, reference.symbol("dispatch")), [])
|
||||
|
||||
def test_custom_table_with_missing_or_external_entry_is_not_selected(self):
|
||||
for entries in ((0x10, 0x20, 0x80), (0x10, 0x20, 0x30)):
|
||||
reference = fixture(entries, source=True)
|
||||
if entries[-1] == 0x30:
|
||||
del reference.relocations[2][0x48]
|
||||
self.assertEqual(tool.reference_tables(reference, reference.symbol("dispatch")), [])
|
||||
|
||||
def test_auto_custom_table_still_detects_swapped_entries(self):
|
||||
reference = fixture(source=True)
|
||||
source = fixture((0x20, 0x10, 0x30), source=True, table_offset=0x90)
|
||||
with patch.object(tool, "read_object", side_effect=[source, reference]):
|
||||
with contextlib.redirect_stdout(io.StringIO()) as output:
|
||||
self.assertEqual(tool.main(["unused", "dispatch"]), 1)
|
||||
self.assertIn("@123: 1/3 entries match", output.getvalue())
|
||||
|
||||
def test_cli_exit_codes(self):
|
||||
for source, expected_status in [(fixture(source=True), 0),
|
||||
(fixture((0x20, 0x10, 0x30), source=True), 1)]:
|
||||
|
||||
Reference in New Issue
Block a user