Repository navigation
Name 29 TObjPlayer functions on camera-capture, record-accessor and held-sub-band evidence - #312
Merged
Merged
Conversation
…accessor + 5 held sub-band) composed from 1fcf2fad8/76cf7a80f/a5d1a65ca — 15f/175+/175- line-neutral; resolution shape = 10B re-derived vs intermediate (hdr gap-1 context edge); KEEP 0x800847FC + 0x801C2114 byte-kept
✅ CI passed ·
|
| Check | Result |
|---|---|
| Build + DOL SHA-1 | ✅ |
No regressions (report_delta --check) |
✅ |
| Linked units still link | ✅ |
| Metric | Base | PR | Δ |
|---|---|---|---|
| Matched data (bytes) | 1,729,805 | 1,729,805 | 0 |
| Complete data (bytes) | 1,729,353 | 1,729,353 | 0 |
| Matched code (bytes) | 4,344,964 | 4,344,964 | 0 |
| Complete code (bytes) | 4,332,364 | 4,332,364 | 0 |
| Matched functions | 27,566 | 27,566 | 0 |
| Linked units | 2,564 | 2,564 | 0 |
0 new exact functions, 0 function regressions, 29 renamed functions.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Composed + battery-verified at ship time @
cad0f459b— triple replay guards exact at every step (below).Title: Name 29 TObjPlayer functions on camera-capture, record-accessor and held-sub-band evidence
Composition: ONE region PR over one AREA (player region), pre-drafted by f10 rehearsal (w22-19, t_aa1331f6) as
the sequential replay of three battery-green single-pack payloads onto one branch: pack#9 (13 names, apply
1fcf2fad8), pack#10 (11 names, apply76cf7a80fon doc-only parentf9807bd33— parent diff carrier-filtered),pack#10B (5 names, apply
a5d1a65ca). Lane cache/doc commits never ship; payload diffs are carrier-filtered(
-- config include src). Composed diff: 15 files / 175 insertions / 175 deletions, line-neutral per file,zero codegen bytes. Expected battery: Renamed functions: 29 / all eight measures +0 / DOL-EQ / check_pr
PASS (2,559+ linked units all exact, add/drop/skip 0, count-grammar stamped at word-tip).
EXCLUSION honesty: pack#11 questvm (
6b90b6f1b) is a different AREA and is explicitly NOT folded here —it ships as its own region item; nothing in this PR touches questvm.
Zero-rider disclosure: this diff carries no line of
config/GPOE8P/psov3/config.yml. Re-measured in therehearsal replay at
cad0f459b: all 29 OLD placeholder tokens vs the force_active block (17,821 entries) =0 hits; the three nearest BOSS-area rider seats (e.g.
TObjPlayer__sub_802ED984@:1592 per roster-of-record21598d415) are not trio tokens. Rider census note: the roster doc books 23 strict + 1 footnote (:1600,pack#7) — the "24" figure is that union, disclosed as-counted.
INTERLOCK + drift-screen @
cad0f459b(re-verified after the day's upstream merges): open set re-read = {#237, #302, #303, #310}. Per-PR mechanicalfile-list intersection vs the trio's 14 code files = EMPTY for every open PR incl #310; #310 (Elias843,
6c7e08275, CI-green, 13 network files) shares REAL CARRIERS with our open #302/#303 (NetIpv4.c,NetAddrFamily.c, TLobby_804050DC.h, text_80421620.c) — rebase-set {#302,#303} at
cad0f459bis LIVE dutywatch-row for the repo owner (their mergeable=UNKNOWN was GitHub recompute, not a drift verdict; #303's shared carrier
with 307+308 which landed — expect re-pin clean, not assumed). vs the world-move itself: drift ∩ trio-15 =
symbols.txtonly, and their 21 renamed rows there intersect our 29 old rows + 2 KEEP rows in zero;symbols rows 59,890 → 59,890 (delta 0); all open-PR symbol hunks sit ≥ :26866 vs our bands :3455–:3474 /
:12586–:12619 — margin ≥ 14,244 rows; #237's symbols surface is the
GPOP8Pparallel tree (whole-file add,psov3/GPOE8Puntouched). Guards are addr+size-keyed by design; survivors re-printed 29/29 @new tip.Adjacency study (the #10/#10B same-neighborhood question, resolved mechanically): the two packs share
4 files; changed-row gaps: symbols 6,
TObjPlayer_801AF2F0.cpp2, carrierTObjPlayer_801C1FF8.cpp21 —all clean under
git apply -3— and the headerinclude/pso/player/TObjPlayer_801C1FF8.hat gap 1, whichis the single edge where raw sequential replay conflicts (one block, ours/theirs addr-keys disjoint, proven
stable at both bases;
git merge-treepairwise agrees: 9+10 rc=0, 9+10B rc=0, 10+10B rc=1). Resolutionshape (rehearsed, not a guess): replay #9→#10 raw, then #10B RE-DERIVED as boundary-safe name replacement
over its own 5 files against the intermediate state — the 5 tokens are disjoint seats, the conflict existed
only via context lines. Byte-identical result vs the mirror order under the same re-derivation law; raw
#10B-first is order-SENSITIVE (negative control) and is never the blessed path.
Held-KEEP honesty (both constant-stub classes): pack#9 DECLINED 1 —
TObjPlayer__sub_800847FC(0x800847FC, 0x4): "lone
blr, size 0x4, zero executable role evidence" (7e5aea04fharvest / kit16b7e7477); pack#10B HELD 1 —TObjPlayer__sub_801C2114(0x801C2114, 0x8): "li r3,0x0; blr— constantstub, no offset/load/store evidence in body; 8 call sites … naming would transplant a caller-role guess onto
an empty body" (
aefcd825d:fleet/w22_pack10b_remainder.md§41). Both rows are byte-untouched in the composeddiff (proof leg in the sheet). pack#10 itself: DECLINED 0.
set_entity_id REFUSAL row (family-2 naming discipline,
1a69ae553§100/§185-186, verbatim): "only callerBC81C.cpp:84 inside
TObjPlayer__sub_801BC8F0(:81) writesget_entity_id(arg0)into the subobject atarg0+0x34C— field-role NOT transplanted (landedset_entity_id__8TObjBaseFUsstores at +0x1C, not +2:TItem.s:4300⇒ rejected as a name source, disclosed)" ⇒ seat 0x801C2244 namedset_field2_s16.29 seats — three sub-families (class-(i) evidence retained from the harvest docs):
Family A — camera-capture band 0x800845F8–0x80084840 (pack#9, HIGH 8 / MED 5). Evidence exhibits
(
7e5aea04f:fleet/w22_pack9_harvest.md): "body cpp:952–954 (=shared_capture_texture_list.entries->texture-> surface->pixels, chain landed at cpp:391) + asm .s:1907 (lis r3, shared_capture_texture_list@ha) + callerroles TMovie_80143988.cpp:244–245" · "guarded body cpp:960–966 (tests LANDED global
shared_capture_texture_list,calls LANDED
release_texture_list)" · "leaf body cpp:990&= ~0x10= clear bit4 — bit4 named by LANDED readerget_camera_flag__10TObjPlayerFv".Family B — record-accessor band 0x801C21AC–0x801C22BB (pack#10, HIGH 9 / MED 2, DECLINED 0). Evidence
exhibits (
1a69ae553§71/§94): "sub_801C21C4=mulli r0,r4,0x1c+add+lbz r3,0x6(r3)— stride 0x1C,field at +6 …
O_801C21C4 { E_801C21C4 recs[8]; }pin the array base at record+0xE1" · "asm .s:219-221 …caller
TObjPlayer__sub_801BCA14BC81C.cpp:112 loopi<0x13paired with landedget_slot_value_checked__10TObjPlayerFl"· run economics "11/11 seats externally referenced, 32 hits, 14 cross-TU call sites; the two-largest-gap cut
(0xAC, 0x70) reproduces pack#9's documented partition 2+4+11 exactly".
Family C — held sub-band 0x801C2044–0x801C2134 (pack#10B, HIGH 1 / MED 4, HELD 1). Evidence exhibits
(
aefcd825d:fleet/w22_pack10b_remainder.md): the 6 held seats of the 2+4+11 remainder: 5 named here +KEEP 0x801C2114 (quote above); apply gate "≥2 evidence-backed proposals → 5 → APPLIED".
Rehearsed proof (zero-build, clone
cache/scratch/w22_region29rehearsal): fixed order #9→#10→(#10Bre-derived) reproduces 15f/175+/175− / residue 0 /
diff --checkrc=0 / symbols 29/29 name-only pairs withbyte-identical addr+size tails / KEEP rows absent from changed lines / mask-grep
****= 0 / composed pathsbuild-input-inert; composed diff sha256 prefix
01a7d3ae7549@cad0f459b(426f6d8c8ba9@9925c2c50—context absorbs the merged world, content law unchanged); order-mirror equivalence proven at the pre-move
base (
426f6d8c8ba9==426f6d8c8ba9).Battery (composition, measured at ship): Renamed functions 29 (report_delta vs pre-replay baseline
B14 @cad0f459b, addr-keyed);regressions 0, missing 0, failures 0; eight measures flat (all deltas +0); DOL build byte-identical to era pin
0d85744b51d7379efb025a943d0cd5aaae2191a3across the whole triple (name-input-inert proven by build);check_pr PASS — link_units check OK, 2,564 linked units all exact, add/drop/skip 0; compose diffstat 15 files /
+175/−175 line-neutral; symbols 29/29 pairs name-string-only, addr+size tails byte-identical (python field-compare);
old-token residue census 0; whitespace
diff --checkempty; markers/masks clean.Disclosures: (1) pack#10 apply parent is the doc-only
f9807bd33, not master — disclosed and cmp-proveninert (kit10-11 card + f10 rehearsal rehearsal). (2) pack#10 harvest cites symbols "58,867"; measured 59,890 @both
bases — count-grammar erratum, row-keyed guards unaffected. (3) #10 changed-line token census = 32 distinct:
29 renamed + 1 co-located retained (
TObjPlayer__sub_801BEB68) + 2 KEEP co-locations — conservation stands.(4) p9 line purity 90/91 single-token replacements + the 1 documented carrier
:956double-token line(91-union law). (5)
git merge-treeoctopus-3 not supported by host git (rc=129) — pairwise meters + sequentialrehearsal stand in; disclosed here. (6) SIM-B order-mirror not re-run at
cad0f459b(disclosed scope): conflict-shapeand SIM-A replay were; disposition: re-runnable verbatim from
.premerge/f1_leg3c.py/f1_leg3e.py.As-of stamps: rehearsal base
cad0f459b(=origin/master at word-check; superseded bases9925c2c50);payloads
1fcf2fad8/76cf7a80f/a5d1a65ca; docs7e5aea04f/1a69ae553/aefcd825d; kits16b7e7477/9476f264e; roster-of-record21598d415; open set {237,302,303,310}; measured 2026-11-17 (PST), f10 rehearsal,branch
card-w22premerge-f10, builds 0, pushes 0, gh writes 0.Composed by Scott's Hermes agent (AI-assisted); reviewed and submitted by Scott Lowry.