Compare commits

...

16 Commits

Author SHA1 Message Date
coah
0ab7ff0970 docs(agents): add orchestrator handoff section (tools, state, pickup steps) 2026-10-02 03:44:28 +00:00
github-actions[bot]
f18d945894 docs: update progress [skip ci] 2026-10-02 03:02:34 +00:00
coah
bc505c3b8a Restore sensitivity projection constant pool and link source (#716) 2026-10-01 21:49:43 -05:00
coah
a5f79b81fa Correct memo Manager title setter vtable target (#715) 2026-10-01 21:35:19 -05:00
github-actions[bot]
137edaff42 docs: update progress [skip ci] 2026-10-02 01:58:17 +00:00
coah
4a7353ec73 Restore sound globals and link iplSound (#713) 2026-10-01 20:57:25 -05:00
coah
618e713b53 docs(agents): describe the Claude orchestrator / Codex worker loop (#711)
Effort scale, silent mode for workers, gate and landing rules, the PR
review daemon and auto-merge conditions, single-orchestrator rule, and
the policy additions (no retail .s linking, definition-level volatile).
2026-10-01 20:56:59 -05:00
github-actions[bot]
3dcd723459 docs: update progress [skip ci] 2026-10-02 01:55:54 +00:00
coah
4ed63ff786 match(tiHKBManager): key validity (worker 4e3e9738) (#712) 2026-10-01 20:54:55 -05:00
coah
eb8b9b978d Discover compiler-named and custom jump tables (#710) 2026-10-01 20:29:36 -05:00
github-actions[bot]
10e3f47e64 docs: update progress [skip ci] 2026-10-02 01:19:23 +00:00
coah
006457008c match(pf_fat): fsinfo byte order and sector rounding, 34/35 (worker 4129772d) (#709) 2026-10-01 20:18:35 -05:00
github-actions[bot]
75677c746b docs: update progress [skip ci] 2026-10-02 01:16:28 +00:00
coah
ccbc04a997 match(NHTTP_stdlib_RVL): hex/decimal parsing, 10/14 (worker 8531a6bf) (#708) 2026-10-01 20:15:19 -05:00
coah
da35a476bf Decompile sound effect stopping with a void return (#707) 2026-10-01 20:12:48 -05:00
coah
589bee2b0d Decompile system sound initialization (#706) 2026-10-01 20:07:38 -05:00
13 changed files with 480 additions and 329 deletions

164
AGENTS.md
View File

@@ -164,9 +164,8 @@ 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 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
to decompilation. Keep every worker slot busy (currently four Codex slots; see
"Orchestrator loop" below). Fill completed slots with disjoint tasks. Never duplicate a source file or function
range. Workers return changed paths, exact objdiff measurements, and validation
results. Fuzzy-only results are not accepted.
@@ -246,6 +245,12 @@ 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.
@@ -320,6 +325,159 @@ 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

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.39% | 88.21% | 62.52% | 92.12% |
| 99.39% | 88.26% | 62.75% | 92.12% |
units 921/1027 complete, functions 12239/12563 matched.
units 923/1027 complete, functions 12245/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -689,7 +689,7 @@ config.libs = [
]
),
IPLSection("sound", [
Object(NonMatching, "sound/iplSound.cpp"),
Object(Matching, "sound/iplSound.cpp"),
]
),
IPLSection("iplwww", [
@@ -869,7 +869,7 @@ config.libs = [
),
IPLSection("setting", [
Object(NonMatching, "scene/setting/iplSetting.cpp"),
Object(NonMatching, "scene/setting/iplSensitivity.cpp"),
Object(Matching, "scene/setting/iplSensitivity.cpp"),
Object(Matching, "scene/setting/iplNCDSetting.cpp"),
Object(Matching, "scene/setting/iplParental.cpp"),
Object(Matching, "scene/setting/iplAPScanThread.cpp"),

View File

@@ -113,6 +113,8 @@ 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

View File

@@ -44,7 +44,7 @@ namespace ipl {
int stopBGM(int unk = 0);
#endif
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
int stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
void 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[0x18];
u32 unk_0x620[3];
};
// use getSystem() and getBannerPlayer() instead

View File

@@ -1232,8 +1232,6 @@ 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;
@@ -1249,12 +1247,10 @@ s32 PFFAT_GetSector(PFFAT_FFD* file, u32 fileSectorIndex, u32 mode,
}
chainIndex = fileSectorIndex >> volume->bpb.log2_sectors_per_cluster;
if (mode == 2) {
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;
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);
error = PFFAT_GetClusterAllocated(file, chainIndex, numClusters,
&cluster);
if (error != 0) {
@@ -1876,11 +1872,12 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
error = 17;
}
if (error == 0) {
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* 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;
((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] =
@@ -1889,11 +1886,9 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
(u8)(volume->num_free_clusters >> 24);
} else {
u32 freeClusters = volume->num_free_clusters;
((PFFAT_FSINFO*)page->p_buf)->num_free_clusters.word =
(freeClusters << 24) |
((freeClusters & 0xFF00) << 8) |
((freeClusters >> 8) & 0xFF00) | (freeClusters >> 24);
u32 upperBytes = (freeClusters << 24) | ((freeClusters << 8) & 0x00FF0000);
u32 lowerBytes = (freeClusters >> 24) | ((freeClusters >> 8) & 0xFF00);
info->num_free_clusters.word = upperBytes | lowerBytes;
}
error = PFSEC_WriteData(
volume, page->p_buf, volume->bpb.fs_info_sector, 0,

View File

@@ -67,10 +67,11 @@ 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) {
s8 character=LowerCase(*string);
u8 rawCharacter = *(const u8*)string;
s8 character = LowerCase((s8)rawCharacter);
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 {
@@ -103,9 +104,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};
BOOL started;
int digit;
char* output;
int digit;
BOOL started;
s32 length;
output = destination;
length = 0;
@@ -135,18 +136,22 @@ s32 NHTTPi_compareToken(const char* left, const char* right) {
}
s32 NHTTPi_strtonum(const char* string, u32 length) {
int digits=0;
s32 value=0;
while(length--) {
int character=*string++;
if(character==' ') continue;
if((character>='0') & (character<='9')) {
value=value*10+character-'0';
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';
++digits;
if(digits>9) return -1;
if (digits > 9) return -1;
}
}
if(digits==0) return -1;
if (digits == 0) return -1;
return value;
}

View File

@@ -497,7 +497,23 @@ u32 HKBManager::KeySet::GetVCode() const {
}
u32 HKBManager::KeySet::IsValid() const {
return CheckValidity();
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;
}
HKBManager::KeySet HKBManager::KeySet::GetNext() const {

View File

@@ -17,8 +17,16 @@ 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;
@@ -47,8 +55,9 @@ void SensitivityDrawing::draw(nand::File* texture) {
GXInitTexObjWrapMode(&image, GX_MIRROR, GX_MIRROR);
f32 width = projection.GetWidth();
f32 height = projection.GetHeight();
f32 horizontalScale = (0.5f * width) / 1024.0f;
f32 verticalScale = (0.5f * height) / 768.0f;
f32 horizontalScale = SensitivityDrawing::horizontalScale(width);
f32 verticalScale;
SensitivityDrawing::verticalScale(height, verticalScale);
int sample = WPADGetLatestIndexInBuf(controller->getChannel());
DPDObject* object;
DPDObject* first;
@@ -76,7 +85,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 = (object->y - 384) * verticalScale;
f32 y = projectY(object->y, verticalScale);
GXColor foreground = {255, 255, 255, 255};
nw4r::ut::Rect rectangle(x - radius, -y + radius - -45.0f,
x + radius, -y - radius - -45.0f);

View File

@@ -10,13 +10,6 @@
#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;
@@ -24,19 +17,9 @@ 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();
@@ -45,9 +28,8 @@ extern "C" void SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi();
namespace ipl {
namespace snd {
extern "C" void __vt__Q33ipl3snd6System();
System::System() {
inline System::System() {
}
struct tagSSeInfo {
@@ -59,39 +41,30 @@ namespace ipl {
u32 id;
};
tagSSeInfo::tagSSeInfo() {
inline tagSSeInfo::tagSSeInfo() {
}
BOOL m_isLocked;
struct tagSBgmInfo {
nw4r::snd::SoundHandle handle;
tagSBgmInfo();
~tagSBgmInfo();
};
tagSBgmInfo::tagSBgmInfo() {
inline tagSBgmInfo::tagSBgmInfo() {
}
tagSSeInfo::~tagSSeInfo() {
inline tagSSeInfo::~tagSSeInfo() {
}
tagSBgmInfo::~tagSBgmInfo() {
inline tagSBgmInfo::~tagSBgmInfo() {
}
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
}
tagSSeInfo _seBlk[16];
tagSBgmInfo _bgmBlk;
System sSystem;
BannerSoundPlayer sBannerSoundPlayer;
nw4r::snd::SoundHandle* _mainBGMHandle;
BOOL m_isLocked;
static const nw4r::snd::FxReverbHi::ReverbHiParam reverbHiParam = {
0.0f,
@@ -102,183 +75,6 @@ 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;
@@ -315,32 +111,10 @@ 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();
@@ -351,9 +125,9 @@ namespace snd {
return NULL;
}
EGG::ArcPlayer::startSound(&_bgmBlk, bgmName);
_mainBGMHandle = &_bgmBlk;
return &_bgmBlk;
EGG::ArcPlayer::startSound(&_bgmBlk.handle, bgmName);
_mainBGMHandle = &_bgmBlk.handle;
return &_bgmBlk.handle;
}
nw4r::snd::SoundHandle* System::startSE(const char* sndName) {
@@ -422,7 +196,7 @@ namespace snd {
}
block->handle.Stop(0);
mSoundArchivePlayer.StartSound(&block->handle, sndIndex);
EGG::ArcPlayer::startSound(&block->handle, sndIndex);
block->id = sndIndex;
return (int)block;
}
@@ -520,6 +294,27 @@ namespace snd {
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;
@@ -543,6 +338,137 @@ namespace snd {
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;
@@ -624,6 +550,14 @@ 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;
@@ -642,5 +576,10 @@ 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

View File

@@ -196,45 +196,12 @@ 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) {
snd::getSystem()->initOnMemory(smArg.mResources.file[Arg::SOUND]->getBuffer(), getSoundHeap(), getSoundHeap()->getAllocatableSize(32));
const void* buffer = smArg.mResources.file[Arg::SOUND]->getBuffer();
u32 size = getSoundHeap()->getAllocatableSize(32);
snd::getSystem()->initOnMemory(buffer, getSoundHeap(), size);
smArg.mbSndResLoaded = true;
}
#endif
void* System::loadZiDIC_(void* arcData, const char* fileName) {
void* buffer = NULL;

View File

@@ -5,9 +5,11 @@ 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 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,
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,
never from an assumption that both data sections have the same layout.
"""
@@ -113,7 +115,11 @@ 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.name.startswith("jumptable_") and s.size]
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")))]
result = []
for table in candidates:
if not isinstance(table.section, int) or table.size % 4:
@@ -123,10 +129,15 @@ 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 = [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))
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))
elif name:
raise ValueError("reference table does not target the selected function")
return result

View File

@@ -144,6 +144,55 @@ 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)]: