Compare commits

...

31 Commits

Author SHA1 Message Date
Devin AI
c56cd025f6 misc1 attempts: UpdateThread lwzx reload analysis + wpformatter def-order variant
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 13:17:26 +00:00
Devin AI
f7e2e49fee iplESMisc: DUD titleId inline-deref + single-local reload decode (exact 449 insns, 89.53)
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 12:52:44 +00:00
Devin AI
154fb5b299 misc1.attempts: Getter_ web-binding analysis — 14 word diffs, scope experiments exhausted
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 12:06:53 +00:00
Devin AI
ebc8205b9d BS2Update: volatile State/EntriesCount decls — UpdateThread 92->94.3
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 11:59:43 +00:00
Devin AI
d20a1e062c BS2Mach: volatile decls for callback-touched flags (AbortFlag/RestartRequested/FatalErrorFlag/PartitionOpen/LoadingTitle) + vu16 hwreg stores — BS2Tick 1123->1117
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 11:52:38 +00:00
Devin AI
8b678466e3 misc1.attempts: BS2Tick decode batch + Getter_ exhaustion evidence
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 11:42:15 +00:00
Devin AI
c734c88148 BS2Tick: bootArea strncmp web + case-0x25 break/partition hoist + banner align + streaming local
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 11:32:40 +00:00
Devin AI
ab2ef1d510 BS2Mach .data: align carved literal names to MWCC emission (all 95 objects pair)
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 10:25:50 +00:00
Devin AI
9266adbb1a odh: s32 width web-class fix + mullw operand order; BS2UpdateInit arg4 analysis
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 10:05:23 +00:00
Devin AI
fb57813580 misc1.attempts: BS2Mach residuals — head weave, diAddr rotation, BS2Tick callee window
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 09:21:07 +00:00
Devin AI
d567b1017b BS2Mach: DivideCallback 100%, CheckBS2 99.51, .data inner-literal carving
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 09:17:41 +00:00
Devin AI
9958ebf072 www_wiisetting: data 100% (Getter_ strBuf removal aligns jumptable relocs; 121+2 symbols.txt literal renames). Getter_ 99.86: 2 web-rotation pairs
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 08:52:25 +00:00
Devin AI
7f29fb70a3 misc1: odh setQuantizationTable 100% + symbols.txt literal pairing
result-through-temp web split flips cdj_c_setQuantizationTable to 100%
(23/28 fns, matched_code 8320). Renamed orig lbl_ sdata2 literals to
emitted @NNNN names — pairs the LineConv11 float pool symbols.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 08:43:02 +00:00
Devin AI
035fe767c8 misc1: BS2UpdateInit 79.88 -> 94.0 via early &Flags0 def
pFlags = Flags0 materializes the bss base web in the prologue; MWCC
then anchors a callee reg (r30) and folds Flags1/Thread/stack addresses
as offsets, reproducing orig's fold codegen and savegpr_29 frame.
Residual: pFlags store (+2 insns), stack-top two-step (fold tie).

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 08:37:01 +00:00
Devin AI
98f91a2475 misc1: AxAdpcmPlayer 100% — flip to Matching
In-loop pAxvpbBuf assignment births the &axVoiceBuf web after
coeffsBufB's (use order), reproducing orig's materialization order;
all in-loop uses routed through the alias so it stays a single
callee-pinned web (r17). 0 instruction diffs, matched_code 3088/3088,
matched_data 6476/6476, DOL sha1 verified.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 08:05:20 +00:00
Devin AI
7a9f07fc77 BS2Update: -sdata 8 extra_cflags for ...data.0 literal pool + sdata smalls
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 07:22:07 +00:00
Devin AI
0b1c20ee0f BS2Update volatile rc decode + BS2Mach stmt-order web fix
- static volatile s32 rc (orig reloads per-access; UpdateThread 92.3->93.35)
- UpdateThread sdata string pairs via symbols.txt @-renames
- BS2NANDDivideCallback stmt-order swap resolves r5/r6 web pairing
- iplSound.h: drop IPL_SOUND_MATCHING resetAllSound guard (upstream now Matching)

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 06:00:32 +00:00
Devin AI
35f2cae118 misc1: wprintf __wpformatter 99.27->99.38 (signed /2 diff + buff+512 call arg decodes)
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:22 +00:00
Devin AI
1ef24d1600 misc1: AxAdpcm start decode (member-load + direct-array webs) 14->1 diffs; symbols.txt literal renames
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:22 +00:00
Devin AI
8e30630b02 misc1: decode DUD s32 return (ret callee-pinned); AxAdpcm coeffs local
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:22 +00:00
Devin AI
436146576e misc1: pair wiisetting strProps via symbols.txt; document w1004 walls
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:22 +00:00
Devin AI
f9b48c3b4f misc1: attempts — symbols.txt lever verified, AxAdpcm start parked
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:22 +00:00
Devin AI
6b14d400eb symbols.txt: name anon .sdata/.sbss objects (iplESMisc data 100%, www_wiisetting MSG_* pair)
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:22 +00:00
Devin AI
8d17448cc3 BS2Update .sbss 100%: semantic symbols.txt names for 4 anon objects (splitter propagates to orig .o)
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:22 +00:00
Devin AI
3fe3424570 misc1: attempts notes
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:22 +00:00
Devin AI
4beff22472 odh: remove ODHEncodeRGBA8/Y8U8V8 + ODHDecodeY8U8V8 (absent from orig .o)
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:22 +00:00
Devin AI
eb59607940 BS2Update: decode .bss as 5 separate GLOBAL objects + pFlags=Flags0 init
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:20 +00:00
Devin AI
7b83d86bb4 wprintf: named buff_end web, wpformatter residual regname ties
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:16 +00:00
Devin AI
ff2db54d42 www_wiisetting: strBuf init-at-decl, Getter_ 9 regname diffs left
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:16 +00:00
Devin AI
a715aa6bb0 iplSound: decode .bss globals — u32 unk[3] + UnkCls wrapper (0xd8), sSystem 0x63c; data 100%
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:15 +00:00
Devin AI
1847720857 BS2Mach: semantic STB_GLOBAL decode, data sections 100%
- rename lbl_XXX decls to orig symtab semantic names (static for LOCAL-bound)
- u32 nandLen hoist in NANDDivide Async fns
- CacheCommandComplete = NandPending shared-const form at 2 sites
- iplSound/BS2Update/iplESMisc decode progress

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 05:46:07 +00:00
11 changed files with 1147 additions and 383 deletions

View File

@@ -13831,9 +13831,9 @@ gArDeconvPlttTbl = .rodata:0x8160E3E8; // type:object size:0xC00 scope:local
gArDc_luminance_huffTable = .rodata:0x8160EFE8; // type:object size:0x30 scope:local
gArDc_chrominance_huffTable = .rodata:0x8160F018; // type:object size:0x30 scope:local
reverbHiParam__Q23ipl3snd = .rodata:0x8160F048; // type:object size:0x18 scope:local
lbl_8160F060 = .rodata:0x8160F060; // type:object size:0x90
lbl_8160F0F0 = .rodata:0x8160F0F0; // type:object size:0x164
lbl_8160F254 = .rodata:0x8160F254; // type:object size:0x120 data:4byte
kbLangUsaLUT__Q23www10wiisetting = .rodata:0x8160F060; // type:object size:0x90
kbLangEurLUT__Q23www10wiisetting = .rodata:0x8160F0F0; // type:object size:0x164
byteProps__Q23www10wiisetting = .rodata:0x8160F254; // type:object size:0x120 data:4byte
scAnmTable__10homebutton = .rodata:0x8160F378; // type:object size:0x60 scope:local data:4byte
scGroupAnmTable__10homebutton = .rodata:0x8160F3D8; // type:object size:0x250 scope:local data:4byte
__DVDErrorMessage = .rodata:0x8160F628; // type:object size:0x28
@@ -15048,82 +15048,85 @@ __vt__Q37ext_ead3www58ut_message_cmd<Q47ext_ead3www13BrowserWindow9WindowCmd,32>
@1440 = .data:0x81644069; // type:object size:0xC scope:local data:string
@1445 = .data:0x81644075; // type:object size:0x13 scope:local data:string
@1447 = .data:0x81644088; // type:object size:0x15 scope:local data:string
lbl_816440A0 = .data:0x816440A0; // type:object size:0x38
lbl_816440D8 = .data:0x816440D8; // type:object size:0xB data:string
MSG_TICK_TIMER_TAG__Q23www10wiisetting = .data:0x816440A0; // type:object size:0xC data:byte
MSG_WARNING_TAG__Q23www10wiisetting = .data:0x816440AC; // type:object size:0xA data:byte
MSG_EVENT_TAG__Q23www10wiisetting = .data:0x816440B6; // type:object size:0xA data:byte
Message__Q23www10wiisetting = .data:0x816440C0; // type:object size:0x18 data:byte
wiiSettingName = .data:0x816440D8; // type:object size:0xB data:string
lbl_816440E3 = .data:0x816440E3; // type:object size:0xF data:string
lbl_816440F2 = .data:0x816440F2; // type:object size:0x1F data:string
lbl_81644111 = .data:0x81644111; // type:object size:0xB data:string
lbl_8164411C = .data:0x8164411C; // type:object size:0x25 data:string
lbl_81644141 = .data:0x81644141; // type:object size:0x1A data:string
lbl_8164415B = .data:0x8164415B; // type:object size:0x1F data:string
lbl_8164417A = .data:0x8164417A; // type:object size:0xD data:string
lbl_81644187 = .data:0x81644187; // type:object size:0xA data:string
lbl_81644191 = .data:0x81644191; // type:object size:0xC data:string
lbl_8164419D = .data:0x8164419D; // type:object size:0xC data:string
jumptable_816441AC = .data:0x816441AC; // type:object size:0x120 scope:local
jumptable_816442CC = .data:0x816442CC; // type:object size:0x64 scope:local
lbl_81644330 = .data:0x81644330; // type:object size:0x25 scope:local data:string
lbl_81644355 = .data:0x81644355; // type:object size:0xF scope:local data:string
lbl_81644364 = .data:0x81644364; // type:object size:0x2B scope:local data:string
jumptable_81644390 = .data:0x81644390; // type:object size:0x118 scope:local
lbl_816444A8 = .data:0x816444A8; // type:object size:0x17 data:string
lbl_816444BF = .data:0x816444BF; // type:object size:0x25 data:string
lbl_816444E4 = .data:0x816444E4; // type:object size:0x14 data:string
lbl_816444F8 = .data:0x816444F8; // type:object size:0x2E data:string
jumptable_81644528 = .data:0x81644528; // type:object size:0x104 scope:local
lbl_8164462C = .data:0x8164462C; // type:object size:0x9 data:string
lbl_81644635 = .data:0x81644635; // type:object size:0x9 data:string
lbl_8164463E = .data:0x8164463E; // type:object size:0xC data:string
lbl_8164464A = .data:0x8164464A; // type:object size:0xC data:string
lbl_81644656 = .data:0x81644656; // type:object size:0xA data:string
lbl_81644660 = .data:0x81644660; // type:object size:0xC data:string
lbl_8164466C = .data:0x8164466C; // type:object size:0xD data:string
lbl_81644679 = .data:0x81644679; // type:object size:0xD data:string
lbl_81644686 = .data:0x81644686; // type:object size:0xD data:string
lbl_81644693 = .data:0x81644693; // type:object size:0xA data:string
lbl_8164469D = .data:0x8164469D; // type:object size:0xB data:string
lbl_816446A8 = .data:0x816446A8; // type:object size:0x9 data:string
lbl_816446B1 = .data:0x816446B1; // type:object size:0xB data:string
lbl_816446BC = .data:0x816446BC; // type:object size:0xD data:string
lbl_816446C9 = .data:0x816446C9; // type:object size:0xA data:string
lbl_816446D3 = .data:0x816446D3; // type:object size:0x9 data:string
lbl_816446DC = .data:0x816446DC; // type:object size:0xA data:string
lbl_816446E6 = .data:0x816446E6; // type:object size:0xA data:string
lbl_816446F0 = .data:0x816446F0; // type:object size:0xB data:string
lbl_816446FB = .data:0x816446FB; // type:object size:0x12 data:string
lbl_8164470D = .data:0x8164470D; // type:object size:0xD data:string
lbl_8164471A = .data:0x8164471A; // type:object size:0xA data:string
lbl_81644724 = .data:0x81644724; // type:object size:0x9 data:string
lbl_8164472D = .data:0x8164472D; // type:object size:0x9 data:string
lbl_81644736 = .data:0x81644736; // type:object size:0x9 data:string
lbl_8164473F = .data:0x8164473F; // type:object size:0xD data:string
lbl_8164474C = .data:0x8164474C; // type:object size:0xC data:string
lbl_81644758 = .data:0x81644758; // type:object size:0xA data:string
lbl_81644762 = .data:0x81644762; // type:object size:0x9 data:string
lbl_8164476B = .data:0x8164476B; // type:object size:0xC data:string
lbl_81644777 = .data:0x81644777; // type:object size:0xD data:string
lbl_81644784 = .data:0x81644784; // type:object size:0xB data:string
lbl_8164478F = .data:0x8164478F; // type:object size:0xD data:string
lbl_8164479C = .data:0x8164479C; // type:object size:0xA data:string
lbl_816447A6 = .data:0x816447A6; // type:object size:0xC data:string
lbl_816447B2 = .data:0x816447B2; // type:object size:0xB data:string
lbl_816447BD = .data:0x816447BD; // type:object size:0xA data:string
lbl_816447C7 = .data:0x816447C7; // type:object size:0x9 data:string
lbl_816447D0 = .data:0x816447D0; // type:object size:0xC data:string
lbl_816447DC = .data:0x816447DC; // type:object size:0xA data:string
lbl_816447E6 = .data:0x816447E6; // type:object size:0xA data:string
lbl_816447F0 = .data:0x816447F0; // type:object size:0xA data:string
lbl_816447FA = .data:0x816447FA; // type:object size:0xA data:string
lbl_81644804 = .data:0x81644804; // type:object size:0xC data:string
lbl_81644810 = .data:0x81644810; // type:object size:0xF data:string
lbl_8164481F = .data:0x8164481F; // type:object size:0x9 data:string
lbl_81644828 = .data:0x81644828; // type:object size:0xA data:string
lbl_81644834 = .data:0x81644834; // type:object size:0x64 data:4byte
lbl_81644898 = .data:0x81644898; // type:object size:0x27 data:string
lbl_816448BF = .data:0x816448BF; // type:object size:0x25 data:string
lbl_816448E4 = .data:0x816448E4; // type:object size:0x12 data:string
jumptable_816448F8 = .data:0x816448F8; // type:object size:0x1A0 scope:local
lbl_81644A98 = .data:0x81644A98; // type:object size:0x12 data:string
@17322 = .data:0x8164415B; // type:object size:0x1F data:string
@17445 = .data:0x8164417A; // type:object size:0xD data:string
@17446 = .data:0x81644187; // type:object size:0xA data:string
@17447 = .data:0x81644191; // type:object size:0xC data:string
@17448 = .data:0x8164419D; // type:object size:0xC data:string
@17456 = .data:0x816441AC; // type:object size:0x120 scope:local
@17455 = .data:0x816442CC; // type:object size:0x64 scope:local
@17519 = .data:0x81644330; // type:object size:0x25 scope:local data:string
@17520 = .data:0x81644355; // type:object size:0xF scope:local data:string
@17521 = .data:0x81644364; // type:object size:0x2B scope:local data:string
@17525 = .data:0x81644390; // type:object size:0x118 scope:local
@17528 = .data:0x816444A8; // type:object size:0x17 data:string
@17578 = .data:0x816444BF; // type:object size:0x25 data:string
@17579 = .data:0x816444E4; // type:object size:0x14 data:string
@17581 = .data:0x816444F8; // type:object size:0x2E data:string
@17583 = .data:0x81644528; // type:object size:0x104 scope:local
@16470 = .data:0x8164462C; // type:object size:0x9 data:string
@16473 = .data:0x81644635; // type:object size:0x9 data:string
@16475 = .data:0x8164463E; // type:object size:0xC data:string
@16476 = .data:0x8164464A; // type:object size:0xC data:string
@16477 = .data:0x81644656; // type:object size:0xA data:string
@16488 = .data:0x81644660; // type:object size:0xC data:string
@16489 = .data:0x8164466C; // type:object size:0xD data:string
@16490 = .data:0x81644679; // type:object size:0xD data:string
@16491 = .data:0x81644686; // type:object size:0xD data:string
@16492 = .data:0x81644693; // type:object size:0xA data:string
@16493 = .data:0x8164469D; // type:object size:0xB data:string
@16494 = .data:0x816446A8; // type:object size:0x9 data:string
@16496 = .data:0x816446B1; // type:object size:0xB data:string
@16497 = .data:0x816446BC; // type:object size:0xD data:string
@16501 = .data:0x816446C9; // type:object size:0xA data:string
@16502 = .data:0x816446D3; // type:object size:0x9 data:string
@16503 = .data:0x816446DC; // type:object size:0xA data:string
@16504 = .data:0x816446E6; // type:object size:0xA data:string
@16505 = .data:0x816446F0; // type:object size:0xB data:string
@16506 = .data:0x816446FB; // type:object size:0x12 data:string
@16507 = .data:0x8164470D; // type:object size:0xD data:string
@16508 = .data:0x8164471A; // type:object size:0xA data:string
@16510 = .data:0x81644724; // type:object size:0x9 data:string
@16513 = .data:0x8164472D; // type:object size:0x9 data:string
@16515 = .data:0x81644736; // type:object size:0x9 data:string
@16516 = .data:0x8164473F; // type:object size:0xD data:string
@16519 = .data:0x8164474C; // type:object size:0xC data:string
@16521 = .data:0x81644758; // type:object size:0xA data:string
@16526 = .data:0x81644762; // type:object size:0x9 data:string
@16528 = .data:0x8164476B; // type:object size:0xC data:string
@16529 = .data:0x81644777; // type:object size:0xD data:string
@16530 = .data:0x81644784; // type:object size:0xB data:string
@16531 = .data:0x8164478F; // type:object size:0xD data:string
@16533 = .data:0x8164479C; // type:object size:0xA data:string
@16534 = .data:0x816447A6; // type:object size:0xC data:string
@16537 = .data:0x816447B2; // type:object size:0xB data:string
@16538 = .data:0x816447BD; // type:object size:0xA data:string
@16539 = .data:0x816447C7; // type:object size:0x9 data:string
@16540 = .data:0x816447D0; // type:object size:0xC data:string
@16549 = .data:0x816447DC; // type:object size:0xA data:string
@16550 = .data:0x816447E6; // type:object size:0xA data:string
@16551 = .data:0x816447F0; // type:object size:0xA data:string
@16553 = .data:0x816447FA; // type:object size:0xA data:string
@16554 = .data:0x81644804; // type:object size:0xC data:string
@16555 = .data:0x81644810; // type:object size:0xF data:string
@16560 = .data:0x8164481F; // type:object size:0x9 data:string
@16562 = .data:0x81644828; // type:object size:0xA data:string
strProps__Q23www10wiisetting = .data:0x81644834; // type:object size:0x64 data:4byte
@17659 = .data:0x81644898; // type:object size:0x27 data:string
@17660 = .data:0x816448BF; // type:object size:0x25 data:string
@17661 = .data:0x816448E4; // type:object size:0x12 data:string
@17662 = .data:0x816448F8; // type:object size:0x1A0 scope:local
@17670 = .data:0x81644A98; // type:object size:0x12 data:string
@1472 = .data:0x81644AB0; // type:object size:0x24 scope:local data:string
@1473 = .data:0x81644AD4; // type:object size:0x1F scope:local data:string
@1489 = .data:0x81644AF3; // type:object size:0xB scope:local data:string
@@ -15348,17 +15351,101 @@ SRAMtoSCLang = .data:0x81645A40; // type:object size:0x9 scope:local
@3041 = .data:0x81645D66; // type:object size:0xE scope:local data:string
@3042 = .data:0x81645D74; // type:object size:0xC scope:local data:string
@3043 = .data:0x81645D80; // type:object size:0x26 scope:local data:string
lbl_81645DA8 = .data:0x81645DA8; // type:object size:0x22 data:string
lbl_81645DCA = .data:0x81645DCA; // type:object size:0x1A data:string
lbl_81645DE4 = .data:0x81645DE4; // type:object size:0x3B8
jumptable_8164619C = .data:0x8164619C; // type:object size:0x34 scope:local
lbl_816461D0 = .data:0x816461D0; // type:object size:0x2A data:string
lbl_816461FA = .data:0x816461FA; // type:object size:0x13E
jumptable_81646338 = .data:0x81646338; // type:object size:0xB8 scope:local
lbl_816463F0 = .data:0x816463F0; // type:object size:0x21 data:string
lbl_81646411 = .data:0x81646411; // type:object size:0x3E3
jumptable_816467F4 = .data:0x816467F4; // type:object size:0x5C scope:local
jumptable_81646850 = .data:0x81646850; // type:object size:0x124 scope:local
@3722 = .data:0x81645DA8; // type:object size:0x22 data:string
@3753 = .data:0x81645DCA; // type:object size:0x1A data:string
@3775 = .data:0x81645DE4; // type:object size:0x18 data:string
@3805 = .data:0x81645DFC; // type:object size:0x1A data:string
@3806 = .data:0x81645E16; // type:object size:0x1A data:string
@3807 = .data:0x81645E30; // type:object size:0xA data:string
@3831 = .data:0x81645E3A; // type:object size:0x20 data:string
@3832 = .data:0x81645E5A; // type:object size:0x2E data:string
@3833 = .data:0x81645E88; // type:object size:0x22 data:string
@3834 = .data:0x81645EAA; // type:object size:0x1A data:string
@3835 = .data:0x81645EC4; // type:object size:0x1C data:string
@3879 = .data:0x81645EE0; // type:object size:0x1B data:string
@3880 = .data:0x81645EFB; // type:object size:0x1C data:string
@3882 = .data:0x81645F17; // type:object size:0x17 data:string
@3883 = .data:0x81645F2E; // type:object size:0x10 data:string
@3884 = .data:0x81645F3E; // type:object size:0x1E data:string
@3885 = .data:0x81645F5C; // type:object size:0x17 data:string
@3886 = .data:0x81645F73; // type:object size:0x32 data:string
@3887 = .data:0x81645FA5; // type:object size:0x1B data:string
@3888 = .data:0x81645FC0; // type:object size:0x14 data:string
@3926 = .data:0x81645FD4; // type:object size:0x11 data:string
@3927 = .data:0x81645FE5; // type:object size:0x1A data:string
@3928 = .data:0x81645FFF; // type:object size:0x28 data:string
@3929 = .data:0x81646027; // type:object size:0x2A data:string
@3930 = .data:0x81646051; // type:object size:0x21 data:string
@3931 = .data:0x81646072; // type:object size:0xA data:string
@3932 = .data:0x8164607C; // type:object size:0x14 data:string
@3933 = .data:0x81646090; // type:object size:0x18 data:string
@3934 = .data:0x816460A8; // type:object size:0x19 data:string
@3935 = .data:0x816460C1; // type:object size:0x16 data:string
@3936 = .data:0x816460D7; // type:object size:0x1E data:string
@3937 = .data:0x816460F5; // type:object size:0x11 data:string
@3938 = .data:0x81646106; // type:object size:0x1D data:string
@3939 = .data:0x81646123; // type:object size:0x17 data:string
@3940 = .data:0x8164613A; // type:object size:0x13 data:string
@3941 = .data:0x8164614D; // type:object size:0x22 data:string
@3942 = .data:0x8164616F; // type:object size:0x13 data:string
@3943 = .data:0x81646182; // type:object size:0x1A data:string
@4016 = .data:0x8164619C; // type:object size:0x34 scope:local
@4032 = .data:0x816461D0; // type:object size:0x2A data:string
@4033 = .data:0x816461FA; // type:object size:0x29 data:string
@4079 = .data:0x81646223; // type:object size:0x18 data:string
@4080 = .data:0x8164623B; // type:object size:0x15 data:string
@4081 = .data:0x81646250; // type:object size:0x19 data:string
@4082 = .data:0x81646269; // type:object size:0x10 data:string
@4083 = .data:0x81646279; // type:object size:0x12 data:string
@4084 = .data:0x8164628B; // type:object size:0xF data:string
@4085 = .data:0x8164629A; // type:object size:0x10 data:string
@4086 = .data:0x816462AA; // type:object size:0x16 data:string
@4087 = .data:0x816462C0; // type:object size:0x13 data:string
@4088 = .data:0x816462D3; // type:object size:0x16 data:string
@4089 = .data:0x816462E9; // type:object size:0x18 data:string
@4090 = .data:0x81646301; // type:object size:0x11 data:string
@4091 = .data:0x81646312; // type:object size:0x16 data:string
@4092 = .data:0x81646328; // type:object size:0xE data:string
@4093 = .data:0x81646338; // type:object size:0xB8 scope:local
@4097 = .data:0x816463F0; // type:object size:0x21 data:string
@4102 = .data:0x81646411; // type:object size:0x15 data:string
@4332 = .data:0x81646426; // type:object size:0x17 data:string
@4333 = .data:0x8164643D; // type:object size:0x17 data:string
@4334 = .data:0x81646454; // type:object size:0x17 data:string
@4335 = .data:0x8164646B; // type:object size:0x17 data:string
@4336 = .data:0x81646482; // type:object size:0x20 data:string
@4337 = .data:0x816464A2; // type:object size:0x1D data:string
@4341 = .data:0x816464BF; // type:object size:0x11 data:string
@4342 = .data:0x816464D0; // type:object size:0x17 data:string
@4343 = .data:0x816464E7; // type:object size:0x9 data:string
@4344 = .data:0x816464F0; // type:object size:0x1E data:string
@4345 = .data:0x8164650E; // type:object size:0x1E data:string
@4346 = .data:0x8164652C; // type:object size:0x1E data:string
@4347 = .data:0x8164654A; // type:object size:0x1B data:string
@4348 = .data:0x81646565; // type:object size:0x1B data:string
@4349 = .data:0x81646580; // type:object size:0x1B data:string
@4350 = .data:0x8164659B; // type:object size:0x1F data:string
@4351 = .data:0x816465BA; // type:object size:0x1F data:string
@4352 = .data:0x816465D9; // type:object size:0x1F data:string
@4353 = .data:0x816465F8; // type:object size:0x1F data:string
@4354 = .data:0x81646617; // type:object size:0x18 data:string
@4355 = .data:0x8164662F; // type:object size:0x29 data:string
@4356 = .data:0x81646658; // type:object size:0xC data:string
@4357 = .data:0x81646664; // type:object size:0xA data:string
@4358 = .data:0x8164666E; // type:object size:0x10 data:string
@4359 = .data:0x8164667E; // type:object size:0x1E data:string
@4360 = .data:0x8164669C; // type:object size:0xF data:string
@4361 = .data:0x816466AB; // type:object size:0x1F data:string
@4362 = .data:0x816466CA; // type:object size:0x1C data:string
@4363 = .data:0x816466E6; // type:object size:0xD data:string
@4364 = .data:0x816466F3; // type:object size:0x35 data:string
@4365 = .data:0x81646728; // type:object size:0x19 data:string
@4366 = .data:0x81646741; // type:object size:0x47 data:string
@4367 = .data:0x81646788; // type:object size:0x38 data:string
@4368 = .data:0x816467C0; // type:object size:0x16 data:string
@4369 = .data:0x816467D6; // type:object size:0x1C data:string
@4371 = .data:0x816467F4; // type:object size:0x5C scope:local
@4370 = .data:0x81646850; // type:object size:0x124 scope:local
lbl_81646978 = .data:0x81646978; // type:object size:0x500
jumptable_81646E78 = .data:0x81646E78; // type:object size:0x30 scope:local
@578 = .data:0x81646EA8; // type:object size:0x1C scope:local
@@ -20196,14 +20283,14 @@ lbl_816944EB = .sdata2:0x816944EB; // type:object size:0x1 data:byte
lbl_81694590 = .sdata2:0x81694590; // type:object size:0x4 align:4 data:float
lbl_81694594 = .sdata2:0x81694594; // type:object size:0x4 align:4 data:float
scRsoZeroF = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float
lbl_816945A0 = .sdata2:0x816945A0; // type:object size:0x4 align:4 data:float
lbl_816945A4 = .sdata2:0x816945A4; // type:object size:0x4 align:4 data:float
lbl_816945A8 = .sdata2:0x816945A8; // type:object size:0x4 align:4 data:float
lbl_816945AC = .sdata2:0x816945AC; // type:object size:0x4 align:4 data:float
lbl_816945B0 = .sdata2:0x816945B0; // type:object size:0x4 align:4 data:float
lbl_816945B4 = .sdata2:0x816945B4; // type:object size:0x4 align:4 data:float
lbl_816945B8 = .sdata2:0x816945B8; // type:object size:0x8 align:8 data:double
lbl_816945C0 = .sdata2:0x816945C0; // type:object size:0x8 align:8 data:double
@2217 = .sdata2:0x816945A0; // type:object size:0x4 align:4 data:float
@2218 = .sdata2:0x816945A4; // type:object size:0x4 align:4 data:float
@2219 = .sdata2:0x816945A8; // type:object size:0x4 align:4 data:float
@2220 = .sdata2:0x816945AC; // type:object size:0x4 align:4 data:float
@2221 = .sdata2:0x816945B0; // type:object size:0x4 align:4 data:float
@2222 = .sdata2:0x816945B4; // type:object size:0x4 align:4 data:float
@2223 = .sdata2:0x816945B8; // type:object size:0x8 align:8 data:double
@2230 = .sdata2:0x816945C0; // type:object size:0x8 align:8 data:double
scTvrcMsPerSec = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
scTvrcNsecPerSec = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
scTvrcOne = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
@@ -20251,10 +20338,10 @@ scSoundTwoF = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
scSoundOneF = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
scSoundThirtyF = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
scSoundSixtyF = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float
lbl_816946B8 = .sdata2:0x816946B8; // type:object size:0x8 align:8 data:double
lbl_816946C0 = .sdata2:0x816946C0; // type:object size:0x8 align:8 data:double
lbl_816946C8 = .sdata2:0x816946C8; // type:object size:0x8 align:8 data:double
lbl_816946D0 = .sdata2:0x816946D0; // type:object size:0x8 align:8 data:double
@17457 = .sdata2:0x816946B8; // type:object size:0x8 align:8 data:double
@17458 = .sdata2:0x816946C0; // type:object size:0x8 align:8 data:double
@17518 = .sdata2:0x816946C8; // type:object size:0x8 align:8 data:double
@17580 = .sdata2:0x816946D0; // type:object size:0x8 align:8 data:double
lbl_816946D8 = .sdata2:0x816946D8; // type:object size:0x4 align:4 data:float
lbl_816946DC = .sdata2:0x816946DC; // type:object size:0x4 align:4 data:float
lbl_816946E0 = .sdata2:0x816946E0; // type:object size:0x8 align:8 data:double
@@ -20599,9 +20686,9 @@ lbl_81694C98 = .sdata2:0x81694C98; // type:object size:0x4 align:4 data:float
lbl_81694C9C = .sdata2:0x81694C9C; // type:object size:0x4 align:4 data:float
lbl_81694CA0 = .sdata2:0x81694CA0; // type:object size:0x4 align:4 data:float
lbl_81694CA8 = .sdata2:0x81694CA8; // type:object size:0x8 align:8 data:double
lbl_81694CB0 = .sdata2:0x81694CB0; // type:object size:0x4 align:4 data:float
lbl_81694CB4 = .sdata2:0x81694CB4; // type:object size:0x4 align:4 data:float
lbl_81694CB8 = .sdata2:0x81694CB8; // type:object size:0x8 align:8 data:double
@4196 = .sdata2:0x81694CB0; // type:object size:0x4 align:4 data:float
@4197 = .sdata2:0x81694CB4; // type:object size:0x4 align:4 data:float
@4202 = .sdata2:0x81694CB8; // type:object size:0x8 align:8 data:double
@3511 = .sdata2:0x81694CC0; // type:object size:0x4 scope:local align:4 data:float
@3561 = .sdata2:0x81694CC4; // type:object size:0x4 scope:local align:4 data:float
@3625 = .sdata2:0x81694CC8; // type:object size:0x8 scope:local align:8 data:double
@@ -21579,11 +21666,11 @@ lbl_8169628C = .sdata:0x8169628C; // type:object size:0x4
lbl_81696290 = .sdata:0x81696290; // type:object size:0x4
lbl_81696294 = .sdata:0x81696294; // type:object size:0x4
lbl_81696298 = .sdata:0x81696298; // type:object size:0x4
lbl_816962A0 = .sdata:0x816962A0; // type:object size:0x5 data:string
lbl_816962A5 = .sdata:0x816962A5; // type:object size:0x5 data:string
lbl_816962AA = .sdata:0x816962AA; // type:object size:0x6 data:string
lbl_816962B0 = .sdata:0x816962B0; // type:object size:0x7 data:string
lbl_816962B7 = .sdata:0x816962B7; // type:object size:0x9 data:string
@17944 = .sdata:0x816962A0; // type:object size:0x5 scope:local data:string
__FUNCTION__$16810 = .sdata:0x816962A5; // type:object size:0x5 scope:local data:string
__FUNCTION__$16845 = .sdata:0x816962AA; // type:object size:0x6 scope:local data:string
__FUNCTION__$16875 = .sdata:0x816962B0; // type:object size:0x7 scope:local data:string
__FUNCTION__$16927 = .sdata:0x816962B7; // type:object size:0x8 scope:local data:string
@11572 = .sdata:0x816962C0; // type:object size:0x4 scope:local data:string
lbl_816962C8 = .sdata:0x816962C8; // type:object size:0x5 data:string
sProtocolName__Q23www9arcreader = .sdata:0x816962D0; // type:object size:0x4 data:4byte
@@ -21597,57 +21684,57 @@ globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
globalNames__Q23www10wiisetting = .sdata:0x81696314; // type:object size:0x8
lbl_8169631C = .sdata:0x8169631C; // type:object size:0x1
lbl_8169631D = .sdata:0x8169631D; // type:object size:0x8 data:string
lbl_81696325 = .sdata:0x81696325; // type:object size:0x4 data:string
lbl_81696329 = .sdata:0x81696329; // type:object size:0x8 data:string
lbl_81696331 = .sdata:0x81696331; // type:object size:0x6 data:string
lbl_81696337 = .sdata:0x81696337; // type:object size:0x8 data:string
lbl_8169633F = .sdata:0x8169633F; // type:object size:0x4 data:string
lbl_81696343 = .sdata:0x81696343; // type:object size:0x8 data:string
lbl_8169634B = .sdata:0x8169634B; // type:object size:0x6 data:string
lbl_81696351 = .sdata:0x81696351; // type:object size:0x5 data:string
lbl_81696356 = .sdata:0x81696356; // type:object size:0x6 data:string
lbl_8169635C = .sdata:0x8169635C; // type:object size:0x5 data:string
lbl_81696361 = .sdata:0x81696361; // type:object size:0x5 data:string
lbl_81696366 = .sdata:0x81696366; // type:object size:0x7 data:string
lbl_8169636D = .sdata:0x8169636D; // type:object size:0x7 data:string
lbl_81696374 = .sdata:0x81696374; // type:object size:0x7 data:string
lbl_8169637B = .sdata:0x8169637B; // type:object size:0x8 data:string
lbl_81696383 = .sdata:0x81696383; // type:object size:0x5 data:string
lbl_81696388 = .sdata:0x81696388; // type:object size:0x7 data:string
lbl_8169638F = .sdata:0x8169638F; // type:object size:0x7 data:string
lbl_81696396 = .sdata:0x81696396; // type:object size:0x8 data:string
lbl_8169639E = .sdata:0x8169639E; // type:object size:0x3 data:string
lbl_816963A1 = .sdata:0x816963A1; // type:object size:0x5 data:string
lbl_816963A6 = .sdata:0x816963A6; // type:object size:0x4 data:string
lbl_816963AA = .sdata:0x816963AA; // type:object size:0x5 data:string
lbl_816963AF = .sdata:0x816963AF; // type:object size:0x4 data:string
lbl_816963B3 = .sdata:0x816963B3; // type:object size:0x4 data:string
lbl_816963B7 = .sdata:0x816963B7; // type:object size:0x6 data:string
lbl_816963BD = .sdata:0x816963BD; // type:object size:0x6 data:string
lbl_816963C3 = .sdata:0x816963C3; // type:object size:0x3 data:string
lbl_816963C6 = .sdata:0x816963C6; // type:object size:0x6 data:string
lbl_816963CC = .sdata:0x816963CC; // type:object size:0x7 data:string
lbl_816963D3 = .sdata:0x816963D3; // type:object size:0x6 data:string
lbl_816963D9 = .sdata:0x816963D9; // type:object size:0x8 data:string
lbl_816963E1 = .sdata:0x816963E1; // type:object size:0x7 data:string
lbl_816963E8 = .sdata:0x816963E8; // type:object size:0x5 data:string
lbl_816963ED = .sdata:0x816963ED; // type:object size:0x5 data:string
lbl_816963F2 = .sdata:0x816963F2; // type:object size:0x5 data:string
lbl_816963F7 = .sdata:0x816963F7; // type:object size:0x7 data:string
lbl_816963FE = .sdata:0x816963FE; // type:object size:0x7 data:string
lbl_81696405 = .sdata:0x81696405; // type:object size:0x8 data:string
lbl_8169640D = .sdata:0x8169640D; // type:object size:0x5 data:string
lbl_81696412 = .sdata:0x81696412; // type:object size:0x5 data:string
lbl_81696417 = .sdata:0x81696417; // type:object size:0x8 data:string
lbl_8169641F = .sdata:0x8169641F; // type:object size:0x6 data:string
lbl_81696425 = .sdata:0x81696425; // type:object size:0x4 data:string
lbl_81696429 = .sdata:0x81696429; // type:object size:0x5 data:string
lbl_8169642E = .sdata:0x8169642E; // type:object size:0x7 data:string
lbl_81696435 = .sdata:0x81696435; // type:object size:0x7 data:string
lbl_8169643C = .sdata:0x8169643C; // type:object size:0x7 data:string
lbl_81696443 = .sdata:0x81696443; // type:object size:0x8 data:string
@17314 = .sdata:0x8169631C; // type:object size:0x1
@17449 = .sdata:0x8169631D; // type:object size:0x8 data:string
@17529 = .sdata:0x81696325; // type:object size:0x4 data:string
@16468 = .sdata:0x81696329; // type:object size:0x8 data:string
@16469 = .sdata:0x81696331; // type:object size:0x6 data:string
@16471 = .sdata:0x81696337; // type:object size:0x8 data:string
@16472 = .sdata:0x8169633F; // type:object size:0x4 data:string
@16474 = .sdata:0x81696343; // type:object size:0x8 data:string
@16478 = .sdata:0x8169634B; // type:object size:0x6 data:string
@16479 = .sdata:0x81696351; // type:object size:0x5 data:string
@16480 = .sdata:0x81696356; // type:object size:0x6 data:string
@16481 = .sdata:0x8169635C; // type:object size:0x5 data:string
@16482 = .sdata:0x81696361; // type:object size:0x5 data:string
@16483 = .sdata:0x81696366; // type:object size:0x7 data:string
@16484 = .sdata:0x8169636D; // type:object size:0x7 data:string
@16485 = .sdata:0x81696374; // type:object size:0x7 data:string
@16486 = .sdata:0x8169637B; // type:object size:0x8 data:string
@16487 = .sdata:0x81696383; // type:object size:0x5 data:string
@16495 = .sdata:0x81696388; // type:object size:0x7 data:string
@16498 = .sdata:0x8169638F; // type:object size:0x7 data:string
@16499 = .sdata:0x81696396; // type:object size:0x8 data:string
@16500 = .sdata:0x8169639E; // type:object size:0x3 data:string
@16509 = .sdata:0x816963A1; // type:object size:0x5 data:string
@16511 = .sdata:0x816963A6; // type:object size:0x4 data:string
@16512 = .sdata:0x816963AA; // type:object size:0x5 data:string
@16514 = .sdata:0x816963AF; // type:object size:0x4 data:string
@16517 = .sdata:0x816963B3; // type:object size:0x4 data:string
@16518 = .sdata:0x816963B7; // type:object size:0x6 data:string
@16520 = .sdata:0x816963BD; // type:object size:0x6 data:string
@16522 = .sdata:0x816963C3; // type:object size:0x3 data:string
@16523 = .sdata:0x816963C6; // type:object size:0x6 data:string
@16524 = .sdata:0x816963CC; // type:object size:0x7 data:string
@16525 = .sdata:0x816963D3; // type:object size:0x6 data:string
@16527 = .sdata:0x816963D9; // type:object size:0x8 data:string
@16532 = .sdata:0x816963E1; // type:object size:0x7 data:string
@16535 = .sdata:0x816963E8; // type:object size:0x5 data:string
@16536 = .sdata:0x816963ED; // type:object size:0x5 data:string
@16541 = .sdata:0x816963F2; // type:object size:0x5 data:string
@16542 = .sdata:0x816963F7; // type:object size:0x7 data:string
@16543 = .sdata:0x816963FE; // type:object size:0x7 data:string
@16544 = .sdata:0x81696405; // type:object size:0x8 data:string
@16545 = .sdata:0x8169640D; // type:object size:0x5 data:string
@16546 = .sdata:0x81696412; // type:object size:0x5 data:string
@16547 = .sdata:0x81696417; // type:object size:0x8 data:string
@16548 = .sdata:0x8169641F; // type:object size:0x6 data:string
@16552 = .sdata:0x81696425; // type:object size:0x4 data:string
@16556 = .sdata:0x81696429; // type:object size:0x5 data:string
@16557 = .sdata:0x8169642E; // type:object size:0x7 data:string
@16558 = .sdata:0x81696435; // type:object size:0x7 data:string
@16559 = .sdata:0x8169643C; // type:object size:0x7 data:string
@16561 = .sdata:0x81696443; // type:object size:0x8 data:string
spAllocator = .sdata:0x81696450; // type:object size:0x4 data:4byte
lbl_81696454 = .sdata:0x81696454; // type:object size:0x8 data:string
lbl_8169645C = .sdata:0x8169645C; // type:object size:0x4 data:4byte
@@ -21698,15 +21785,15 @@ Tick = .sdata:0x81696520; // type:object size:0x4 scope:local data:4byte
@2845 = .sdata:0x81696567; // type:object size:0x8 scope:local data:string
@3032 = .sdata:0x8169656F; // type:object size:0x8 scope:local data:string
TicketViews = .sdata:0x81696578; // type:object size:0x4 data:4byte
lbl_8169657C = .sdata:0x8169657C; // type:object size:0x8 data:string
lbl_81696584 = .sdata:0x81696584; // type:object size:0x7
lbl_8169658B = .sdata:0x8169658B; // type:object size:0x5 data:string
lbl_81696590 = .sdata:0x81696590; // type:object size:0x4 data:string
lbl_81696594 = .sdata:0x81696594; // type:object size:0x4 data:string
lbl_81696598 = .sdata:0x81696598; // type:object size:0x2 data:string
lbl_8169659A = .sdata:0x8169659A; // type:object size:0x4 data:string
lbl_8169659E = .sdata:0x8169659E; // type:object size:0x7 data:string
lbl_816965A5 = .sdata:0x816965A5; // type:object size:0x4 data:string
@3869 = .sdata:0x8169657C; // type:object size:0x8 data:string
gameCubeLanguages$1771 = .sdata:0x81696584; // type:object size:0x7
@4326 = .sdata:0x8169658B; // type:object size:0x5 data:string
@4327 = .sdata:0x81696590; // type:object size:0x4 data:string
@4328 = .sdata:0x81696594; // type:object size:0x4 data:string
@1814 = .sdata:0x81696598; // type:object size:0x2 scope:local data:string
@1826 = .sdata:0x8169659A; // type:object size:0x4 scope:local data:string
@1851 = .sdata:0x8169659E; // type:object size:0x7 scope:local data:string
@1858 = .sdata:0x816965A5; // type:object size:0x4 scope:local data:string
views = .sdata:0x816965B0; // type:object size:0x4 scope:local data:4byte
@1792 = .sdata:0x816965B8; // type:object size:0x4 scope:local data:string
lbl_816965C0 = .sdata:0x816965C0; // type:object size:0x4 data:string
@@ -22239,7 +22326,7 @@ scBtnSoundType__Q23ipl5scene = .sdata:0x81697258; // type:object size:0x8 scope:
@12749 = .sdata:0x8169727C; // type:object size:0x5 scope:local data:string
lbl_81697288 = .sdata:0x81697288; // type:object size:0x2
lbl_8169728A = .sdata:0x8169728A; // type:object size:0x4 data:string
lbl_81697290 = .sdata:0x81697290; // type:object size:0x4
voiceVe$3399 = .sdata:0x81697290; // type:object size:0x4
@4605 = .sdata:0x81697298; // type:object size:0x4 scope:local data:string
lbl_816972A0 = .sdata:0x816972A0; // type:object size:0x8
lbl_816972A8 = .sdata:0x816972A8; // type:object size:0x8 data:wstring

View File

@@ -719,7 +719,7 @@ config.libs = [
Object(Matching, "BS2/BS2.c"),
Object(Matching, "BS2/BS2Init.c"),
Object(NonMatching, "BS2/BS2Mach.c"),
Object(NonMatching, "BS2/BS2Update.c"),
Object(NonMatching, "BS2/BS2Update.c", extra_cflags=["-sdata 8"]),
Object(Matching, "BS2/BS2ParentalControl.c"),
Object(Matching, "BS2/BS2BringUp.c"),
Object(Matching, "BS2/BS2Reset.c"),
@@ -901,7 +901,7 @@ config.libs = [
),
IPLSection("bannerSound", [
Object(Matching, "bannerSound/AudioWavePlayer.cpp"),
Object(Equivalent, "bannerSound/AxAdpcmPlayer.cpp"),
Object(Matching, "bannerSound/AxAdpcmPlayer.cpp"),
Object(Matching, "bannerSound/BannerSoundPlayer.cpp"),
Object(Matching, "bannerSound/AudioWaveUtility.cpp"),
]

View File

@@ -50,7 +50,7 @@ namespace ipl {
static BOOL IsLastTicketExpired(ESTitleId* titleId);
static void DeleteExpiredFlagFile();
static void DeleteUnauthorizedData(EGG::Heap* heap);
static s32 DeleteUnauthorizedData(EGG::Heap* heap);
static u32 CheckTmdCountryCode(ESTmdView* tmdView);
static u32 CheckTmdParentalControl(ESTmdView* tmdView);

View File

@@ -977,6 +977,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
long double long_double_num;
wchar_t buff[512];
wchar_t* buff_ptr;
wchar_t* buff_end = buff + 511;
const wchar_t* string_end;
wchar_t fill_char = ' ';
@@ -1038,7 +1039,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
}
}
num_chars = buff + 512 - 1 - buff_ptr;
num_chars = ((long)buff_end - (long)buff_ptr) / 2;
break;
case 'o':
@@ -1080,7 +1081,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
}
}
num_chars = buff + 512 - 1 - buff_ptr;
num_chars = ((long)buff_end - (long)buff_ptr) / 2;
break;
case 'f':
@@ -1099,7 +1100,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
goto conversion_error;
}
num_chars = buff + 512 - 1 - buff_ptr;
num_chars = ((long)buff_end - (long)buff_ptr) / 2;
break;
case 'a':
@@ -1114,7 +1115,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
goto conversion_error;
}
num_chars = buff + 512 - 1 - buff_ptr;
num_chars = ((long)buff_end - (long)buff_ptr) / 2;
break;
case 's':

View File

@@ -29,7 +29,7 @@ typedef struct AppLoaderHeader {
u8 pad_0x1C[4];
} AppLoaderHeader;
u8 TicketViewsBuf[OSRoundUp32B(sizeof(ESTicketView) * 64)] ALIGN32;
static u8 TicketViewsBuf[OSRoundUp32B(sizeof(ESTicketView) * 64)] ALIGN32;
ESTicketView *TicketViews = (ESTicketView *)TicketViewsBuf;
DVDDiskID UpdateDiskID ALIGN32;
OSBootInfo2 bi2 ALIGN32;
@@ -37,42 +37,42 @@ AppLoaderHeader AppLoaderHdr ALIGN32;
OSBootInfo3 bi3 ALIGN32;
u8 GameTOCBuf[OSRoundUp32B(sizeof(DVDGameTOC))] ALIGN32;
DVDDriveInfo DriveInfo ALIGN32;
DVDDiskID DiskID ALIGN32;
DVDPartitionParams PartitionParams ALIGN32;
static DVDDiskID DiskID ALIGN32;
static DVDPartitionParams PartitionParams ALIGN32;
NANDCommandBlock BS2NandBlock;
NANDFileInfo BS2CacheFileInfo;
DVDCommandBlock CoverBlock;
u8 PartitionInfoBuf[OSRoundUp32B(sizeof(DVDPartitionInfo) * 256)] ALIGN32;
DVDCommandBlock Block;
BS2State State = BS2_STT_BEGIN;
vu32 DvdReadPending = 0;
u32 BannerAllocation = 0;
u32 BannerBuffer = 0;
u32 BannerAvailable = 0;
u32 Allocator = 0;
BOOL StartingGame = FALSE;
u32 RestartRequested = 0;
u32 PartitionOpen = 0;
u32 CacheSeekComplete = 0;
u32 LoadingTitle = 0;
BOOL FatalErrorFlag = FALSE;
static BS2State State = BS2_STT_BEGIN;
static vu32 DvdReadPending = 0;
static u32 BannerAllocation = 0;
static u32 BannerBuffer = 0;
static u32 BannerAvailable = 0;
static u32 Allocator = 0;
volatile BOOL StartingGame = FALSE;
static vu32 RestartRequested = 0;
static vu32 PartitionOpen = 0;
static u32 CacheSeekComplete = 0;
static vu32 LoadingTitle = 0;
volatile BOOL FatalErrorFlag = FALSE;
BOOL RetryErrorFlag = FALSE;
BOOL UpdateErrorFlag = FALSE;
BOOL AbortFlag = FALSE;
volatile BOOL AbortFlag = FALSE;
volatile int CacheFailed = 0;
volatile int RegionValid = 0;
volatile int NandPending = 0;
vu32 CancelNand = 0;
u32 LowReadResult = 0;
u32 CacheCommandComplete = 0;
u32 AudioBufferUnconfigured = 0;
u64 ResetTime = 0;
u64 SpinupDeadline = 0;
static volatile int NandPending = 0;
static volatile u32 CancelNand = 0;
static volatile u32 LowReadResult = 0;
static vu32 CacheCommandComplete = 0;
static u32 AudioBufferUnconfigured = 0;
static u64 ResetTime = 0;
static u64 SpinupDeadline = 0;
u64 CoverPollTime = 0;
u32 DriveWasReset = 0;
u32 TitleTicketView = 0;
u32 CurrentTmd = 0;
static u32 TitleTicketView = 0;
static u32 CurrentTmd = 0;
u32 TitleCode = 0;
u32 RequiredIosHigh = 0;
u32 RequiredIosLow = 0;
@@ -85,22 +85,74 @@ u32 CoverOpenTimeHigh = 0;
u32 CoverOpenTimeLow = 0;
vu32 NandTransferred = 0;
vu32 NandLength = 0;
u8 *NandBuffer = NULL;
NANDFileInfo *NandFile = NULL;
volatile u8 *NandBuffer = NULL;
NANDFileInfo *volatile NandFile = NULL;
vu32 NandOperation = 0;
volatile NANDCallback NandCompletion = NULL;
u32 LoaderOffset = 0;
vu32 LoaderLength = 0;
u32 LoaderAddress = 0;
vu32 CacheLength = 0;
vu32 BannerLength = 0;
vu32 DvdTransferLength = 0;
vu32 DvdTransferred = 0;
u32 *DvdProgress = 0;
u32 LoaderClose = 0;
u32 LoaderMain = 0;
u32 LoaderInit = 0;
static vu32 BannerLength = 0;
static vu32 DvdTransferLength = 0;
static vu32 DvdTransferred = 0;
static u32 *DvdProgress = 0;
static u32 LoaderClose = 0;
static u32 LoaderMain = 0;
static u32 LoaderInit = 0;
#define DvdReadPending DvdReadPending
#define BannerAllocation BannerAllocation
#define BannerBuffer BannerBuffer
#define BannerAvailable BannerAvailable
#define Allocator Allocator
#define RestartRequested RestartRequested
#define PartitionOpen PartitionOpen
#define CacheSeekComplete CacheSeekComplete
#define LoadingTitle LoadingTitle
#define CacheFailed CacheFailed
#define RegionValid RegionValid
#define NandPending NandPending
#define CancelNand CancelNand
#define LowReadResult LowReadResult
#define CacheCommandComplete CacheCommandComplete
#define AudioBufferUnconfigured AudioBufferUnconfigured
#define ResetTime ResetTime
#define SpinupDeadline SpinupDeadline
#define CoverPollTime CoverPollTime
#define DriveWasReset DriveWasReset
#define TitleTicketView TitleTicketView
#define CurrentTmd CurrentTmd
#define TitleCode TitleCode
#define RequiredIosHigh RequiredIosHigh
#define RequiredIosLow RequiredIosLow
#define GamePartition GamePartition
#define UpdatePartition UpdatePartition
#define PartitionCursor PartitionCursor
#define DataToc DataToc
#define GameToc GameToc
#define CoverOpenTimeHigh CoverOpenTimeHigh
#define CoverOpenTimeLow CoverOpenTimeLow
#define NandTransferred NandTransferred
#define NandLength NandLength
#define NandBuffer NandBuffer
#define NandFile NandFile
#define NandOperation NandOperation
#define NandCompletion NandCompletion
#define LoaderOffset LoaderOffset
#define LoaderLength LoaderLength
#define LoaderAddress LoaderAddress
#define CacheLength CacheLength
#define BannerLength BannerLength
#define DvdTransferLength DvdTransferLength
#define DvdTransferred DvdTransferred
#define DvdProgress DvdProgress
#define LoaderClose LoaderClose
#define LoaderMain LoaderMain
#define LoaderInit LoaderInit
#define CoverBlock CoverBlock
#define UpdateDiskID UpdateDiskID
#define TicketViews TicketViews
void BS2Report(const char *msg, ...) {
#ifdef ENABLE_BS2_REPORT
@@ -239,16 +291,62 @@ u32 BS2GetBannerBufferLength() { return BannerLength; }
BOOL BS2IsDiagDisc() { return (u8)(*(u8 *)OSPhysicalToCached(OS_ADDR_BOOT_INFO) - 0x30U) <= 1; }
extern vu32 BS2VideoMode;
extern void __pformatter(void);
extern vu32 __DVDLayoutFormat;
void Run(u32 entryPoint, void *start, u32 blockCount, u32 argument) {
u8 *block = start;
for (; blockCount != 0; --blockCount) {
__dcbz(block, 0);
__dcbf(block, 0);
block += 32;
}
((void (*)(u32))entryPoint)(argument);
asm void Run(u32 entryPoint, void *start, u32 blockCount, u32 argument) {
// clang-format off
#ifdef __MWERKS__
nofralloc
mtctr r5
mtlr r3
li r0, 0
li r2, 0
li r3, 0
li r5, 0
li r7, 0
li r8, 0
li r9, 0
li r10, 0
li r11, 0
li r12, 0
li r13, 0
li r14, 0
li r15, 0
li r16, 0
li r17, 0
li r18, 0
li r19, 0
li r20, 0
li r21, 0
li r22, 0
li r23, 0
li r24, 0
li r25, 0
li r26, 0
li r27, 0
li r28, 0
li r29, 0
li r30, 0
li r31, 0
lis r1, (__pformatter + 0x280)@h
ori r1, r1, (__pformatter + 0x280)@l
li r6, 0
b _enter
_loop:
dcbz r4, r0
dcbf r4, r0
addi r4, r4, 0x20
bdnz _loop
b _exit
_exit:
li r4, 0
blr
_enter:
b _loop
#endif
// clang-format on
}
BOOL BS2GetLockedTitles(ESTitleId *pTitleIds, u32 *count) {
@@ -577,7 +675,7 @@ void BS2StartGame() {
u32 (*entry)(void);
StartingGame = TRUE;
while (DVDGetCommandBlockStatus(&CoverBlock) != DVD_STATE_IDLE) {
while (CoverBlock.state != DVD_STATE_IDLE) {
}
BS2Report("BS2StartGame(1)\n");
@@ -677,33 +775,28 @@ void BS2StartGame() {
LowReadResult = 0;
DVDLowReadDiskID(&DiskID, (DVDLowCallback)callback);
while (LowReadResult == 0) {
BOOL enabled = OSDisableInterrupts();
OSRestoreInterrupts(enabled);
}
status = LowReadResult;
if (status != 2) {
if ((status >= 2) || (status < 1)) {
switch (status) {
case 2:
OSReport("\nDisk error(%d) has occurred", LowReadResult);
LowReadResult = 0;
DVDLowRequestError((DVDLowCallback)callback);
while (LowReadResult == 0) {
}
if ((DVDLowGetImmBufferReg() & 0xFF000000) == 0x01000000 ||
(DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {
BS2Reboot();
}
if (DvdTransferred == 0 && (DVDLowGetImmBufferReg() & 0xFF000000) == 0x04000000) {
BS2Reboot();
}
goto disk_fatal;
} else {
case 1:
goto disk_done;
}
} else {
OSReport("\nDisk error(%d) has occurred", LowReadResult);
LowReadResult = 0;
DVDLowRequestError((DVDLowCallback)callback);
while (LowReadResult == 0) {
BOOL enabled = OSDisableInterrupts();
OSRestoreInterrupts(enabled);
}
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
if (driveError == 0x01000000 || (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {
BS2Reboot();
}
if (DvdTransferred == 0 && (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x04000000) {
BS2Reboot();
}
goto disk_fatal;
default:
goto disk_fatal;
}
disk_fatal:
@@ -729,8 +822,6 @@ disk_done:
(DVDLowCallback)callback);
}
while (LowReadResult == 0) {
BOOL enabled = OSDisableInterrupts();
OSRestoreInterrupts(enabled);
}
status = LowReadResult;
@@ -748,8 +839,6 @@ disk_done:
LowReadResult = 0;
DVDLowRequestError((DVDLowCallback)callback);
while (LowReadResult == 0) {
BOOL enabled = OSDisableInterrupts();
OSRestoreInterrupts(enabled);
}
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
if (driveError == 0x01000000 || (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {
@@ -797,8 +886,8 @@ void BS2StartGCGame() {
s32 ret;
u32 rtc;
u32 counterBias;
u32 seconds;
u32 timerFrequency;
u32 seconds;
u32 soundMode;
s8 productVideoMode;
u8 progressiveMode;
@@ -810,7 +899,7 @@ void BS2StartGCGame() {
OSTime time;
StartingGame = TRUE;
while (DVDGetCommandBlockStatus(&CoverBlock) != DVD_STATE_IDLE) {
while (CoverBlock.state != DVD_STATE_IDLE) {
}
soundMode = SCGetSoundMode();
@@ -842,8 +931,7 @@ void BS2StartGCGame() {
__OSGetRTC(&rtc);
counterBias = SCGetCounterBias();
seconds = rtc + counterBias;
timerFrequency = OS_BUS_CLOCK >> 2;
time = (OSTime)seconds * timerFrequency;
time = (OS_BUS_CLOCK >> 2) * (OSTime)seconds;
__OSSetTime(time);
sram = __OSLockSram();
@@ -993,8 +1081,8 @@ void BS2NANDDivideCallback(s32 result, NANDCommandBlock *block) {
} else if (result < 0) {
NandCompletion(result, block);
} else {
NandBuffer += result;
NandTransferred += result;
NandBuffer = NandBuffer + result;
NandTransferred = NandTransferred + result;
if (NandLength - NandTransferred > 0x40000) {
if (NandOperation == 1) {
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
@@ -1009,11 +1097,15 @@ void BS2NANDDivideCallback(s32 result, NANDCommandBlock *block) {
} else {
if (NandLength - NandTransferred != 0) {
if (NandOperation == 1) {
u32 rem;
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, NandLength - NandTransferred);
ret = NANDWriteAsync(NandFile, (void *)NandBuffer, NandLength - NandTransferred, BS2NANDDivideCallback, block);
rem = NandLength - NandTransferred;
ret = NANDWriteAsync(NandFile, (void *)NandBuffer, rem, BS2NANDDivideCallback, block);
} else {
u32 rem;
BS2Report("NANDReadAsync buf:0x%08X, length:0x%08X\n", NandBuffer, NandLength - NandTransferred);
ret = NANDReadAsync(NandFile, (void *)NandBuffer, NandLength - NandTransferred, BS2NANDDivideCallback, block);
rem = NandLength - NandTransferred;
ret = NANDReadAsync(NandFile, (void *)NandBuffer, rem, BS2NANDDivideCallback, block);
}
if (ret < 0) {
NandCompletion(ret, block);
@@ -1026,13 +1118,15 @@ void BS2NANDDivideCallback(s32 result, NANDCommandBlock *block) {
}
void BS2NANDDivideReadAsync(NANDFileInfo *info, void *buffer, u32 length, NANDCallback callback, NANDCommandBlock *block) {
u32 nandLen;
NandCompletion = callback;
NandOperation = 2;
NandLength = length;
NandTransferred = 0;
nandLen = NandLength;
NandFile = info;
NandBuffer = (u8 *)buffer;
if (NandLength > 0x40000) {
if (nandLen > 0x40000) {
BS2Report("NANDReadAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
NANDReadAsync(NandFile, (void *)NandBuffer, 0x40000, BS2NANDDivideCallback, block);
} else {
@@ -1042,13 +1136,15 @@ void BS2NANDDivideReadAsync(NANDFileInfo *info, void *buffer, u32 length, NANDCa
}
void BS2NANDDivideWriteAsync(NANDFileInfo *info, const void *buffer, u32 length, NANDCallback callback, NANDCommandBlock *block) {
u32 nandLen;
NandCompletion = callback;
NandOperation = 1;
NandLength = length;
NandTransferred = 0;
nandLen = NandLength;
NandFile = info;
NandBuffer = (u8 *)buffer;
if (NandLength > 0x40000) {
if (nandLen > 0x40000) {
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
NANDWriteAsync(NandFile, (void *)NandBuffer, 0x40000, BS2NANDDivideCallback, block);
} else {
@@ -1092,8 +1188,11 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write drive info\n");
NandPending = 1;
CacheCommandComplete = 1;
CacheLength = CacheLength + 0x20;
{
u32 newLen = CacheLength + 0x20;
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
@@ -1108,8 +1207,11 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write disk id\n");
NandPending = 1;
CacheCommandComplete = 1;
CacheLength = CacheLength + 0x20;
{
u32 newLen = CacheLength + 0x20;
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
@@ -1124,8 +1226,11 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write game toc\n");
NandPending = 1;
CacheCommandComplete = 1;
CacheLength = CacheLength + 0x20;
{
u32 newLen = CacheLength + 0x20;
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
@@ -1140,13 +1245,16 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write partition ifno\n");
NandPending = 1;
CacheLength += OSRoundUp32B(((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo)) + 32;
CacheCommandComplete = 1;
{
u32 newLen = OSRoundUp32B(((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo)) + 32 + CacheLength;
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
} else {
BS2NANDDivideWriteAsync(&BS2CacheFileInfo, &PartitionInfoBuf, OSRoundUp32B(((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo)) + 32, BS2NANDCallback, &BS2NandBlock);
BS2NANDDivideWriteAsync(&BS2CacheFileInfo, &PartitionInfoBuf, OSRoundUp32B(((DVDGameTOC *)DataToc)->partitionCount << 3) + 32, BS2NANDCallback, &BS2NandBlock);
return 0;
}
}
@@ -1156,8 +1264,11 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write boot info 3\n");
NandPending = 1;
CacheCommandComplete = 1;
CacheLength = CacheLength + 0x2000;
{
u32 newLen = CacheLength + 0x2000;
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
@@ -1172,8 +1283,11 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write open partition\n");
NandPending = 1;
CacheCommandComplete = 1;
CacheLength = CacheLength + 0x4a00;
{
u32 newLen = CacheLength + 0x4a00;
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
@@ -1188,8 +1302,11 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write apploader header\n");
NandPending = 1;
CacheCommandComplete = 1;
CacheLength = CacheLength + 0x20;
{
u32 newLen = CacheLength + 0x20;
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
@@ -1204,8 +1321,11 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write apploader\n");
NandPending = 1;
CacheCommandComplete = 1;
CacheLength = CacheLength + (AppLoaderHdr.length + 0x1fU & 0xffffffe0);
{
u32 newLen = CacheLength + (AppLoaderHdr.length + 0x1fU & 0xffffffe0);
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
@@ -1221,8 +1341,11 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write apploader load\n");
NandPending = 1;
CacheCommandComplete = 1;
CacheLength = CacheLength + LoaderLength;
{
u32 newLen = CacheLength + LoaderLength;
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
@@ -1238,8 +1361,11 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write banner\n");
NandPending = 1;
CacheCommandComplete = 1;
CacheLength = CacheLength + (BannerLength + 0x1fU & 0xffffffe0);
{
u32 newLen = CacheLength + (BannerLength + 0x1fU & 0xffffffe0);
CacheCommandComplete = 1;
CacheLength = newLen;
}
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;
@@ -1396,10 +1522,10 @@ BS2State BS2Tick() {
case 5:
status = CheckBS2CommandStatus();
if (status != 0) {
if (((*(u32 *)0x8000002c) & 0xf0000000) == 0)
(*(u16 *)0x800030e6) = 0x8002;
if (((*(vu32 *)0x8000002c) & 0xf0000000) == 0)
(*(vu16 *)0x800030e6) = 0x8002;
else
(*(u16 *)0x800030e6) = DriveInfo.deviceCode | 0x8000;
(*(vu16 *)0x800030e6) = DriveInfo.deviceCode | 0x8000;
State = BS2_STT_8;
}
break;
@@ -1425,16 +1551,18 @@ BS2State BS2Tick() {
case 9:
case 10: {
DVDDiskID *bootDisc;
char *bootArea;
status = CheckBS2CommandStatus();
if (status == 0)
break;
memcpy((void *)0x80000000, &DiskID, sizeof(DVDDiskID));
bootDisc = (DVDDiskID *)0x80000000;
if (bootDisc->rvlMagic == 0x5d1c9ea3) {
status = strncmp((char *)bootDisc, "RAAE", 4);
if (status == 0 || strncmp((char *)bootDisc, "408", 3) == 0 ||
strncmp((char *)bootDisc, "410", 3) == 0 ||
strncmp((char *)bootDisc, "410", 3) == 0)
bootArea = (char *)0x80000000;
status = strncmp(bootArea, "RAAE", 4);
if (status == 0 || strncmp(bootArea, "408", 3) == 0 ||
strncmp(bootArea, "410", 3) == 0 ||
strncmp(bootArea, "410", 3) == 0)
regionMatches = FALSE;
else
regionMatches = TRUE;
@@ -1458,12 +1586,14 @@ BS2State BS2Tick() {
case 0xb: {
DVDDiskID *bootDisc = (DVDDiskID *)0x80000000;
u32 audioBufferSize;
u8 streaming;
if (AudioBufferUnconfigured == 0) {
State = BS2_STT_GC_GAME;
break;
}
streaming = bootDisc->streaming;
AudioBufferUnconfigured = 0;
if (bootDisc->streaming != 0) {
if (streaming != 0) {
audioBufferSize = bootDisc->streamingBufSize;
audioBufferSize = audioBufferSize != 0 ? audioBufferSize : 10;
__DVDAudioBufferConfig(&Block, 1, audioBufferSize, BS2DVDCallback);
@@ -1803,21 +1933,24 @@ invalidRvlRegion:
State = BS2_STT_RESET_SYSTEM;
break;
}
if (GamePartition == 0) {
if (GamePartition != 0) {
State = BS2_STT_37;
} else {
State = BS2_STT_54;
break;
}
State = BS2_STT_37;
case 0x25:
case 0x25: {
u32 gamePartition = (u32)((DVDPartitionInfo *)GamePartition)->partition;
if (BS2BootFromCache != 0) {
BS2Report("Open partition from cache.dat\n");
NandPending = 1;
BS2NANDDivideReadAsync(&BS2CacheFileInfo, &PartitionParams.tmd, 0x4a00, BS2NANDCallback, &BS2NandBlock);
} else
DVDOpenPartitionAsync(&Block, &PartitionParams.tmd, (u32)((DVDPartitionInfo *)GamePartition)->partition, BS2DVDCallback);
DVDOpenPartitionAsync(&Block, &PartitionParams.tmd, gamePartition, BS2DVDCallback);
PartitionOpen = 1;
State = BS2_STT_38;
break;
}
case 0x26: {
status = CheckBS2CommandStatus();
if (status == 0)
@@ -2008,7 +2141,7 @@ invalidRvlRegion:
if (status == 0)
OSPanic("BS2Mach.c", 0x12c8, "BS2 ERROR >>> Cannnot alloc 0x%08x from MEMAllocator", bannerFile.length);
BannerLength = bannerFile.length;
BannerBuffer = OSRoundDown32B(BannerAllocation) + 32;
BannerBuffer = BannerAllocation + 0x20 - (BannerAllocation & 0x1f);
BS2Report("BannerBufferAddr : %08X\n");
} else {
if ((BannerBuffer != 0) && (BannerLength != 0)) {

View File

@@ -27,10 +27,10 @@ s32 WADImportDVDForBS(const char* path, void* buffer, u32 length);
s32 WADImportDVDExForBS(const char* path, void* buffer, u32 length);
static BS2UpdateEntry* pEntries = NULL;
static u32 EntriesCount = 0;
static vu32 EntriesCount = 0;
static u32* pFlags = NULL;
static void* MemAllocator = NULL;
int State = 0;
volatile int State = 0;
BS2UpdateEntry* CurrentEntry = 0;
static u32 RebootRequired = 0;
static BOOL ContainsSeatTitles = 0;
@@ -39,7 +39,7 @@ static u32 UpdateImportResult = 0;
u32 StartUpdate = 0;
u32 CancelUpdate = 0;
static u32 UpdateProgress = 0;
static s32 rc = 0;
static volatile s32 rc = 0;
static u64 VersionIOS = 0;
static u32 VersionMEM2 = 0;
static u32 VersionES = 0;
@@ -60,6 +60,7 @@ static void* UpdateThread(void* argument);
void BS2UpdateInit(void* allocator) {
BS2Report("initialize BS2Update\n");
pFlags = Flags0;
ConsoleType = OSGetConsoleType();
VersionES = __OSGetHollywoodRev();
VersionMEM2 = OSGetPhysicalMem2Size();
@@ -114,12 +115,12 @@ static void* UpdateThread(void* argument) {
requiredBytes = 0;
requiredInodes = 0;
channelCount = 0;
scratch.freeChannels = 0;
scratch.freeBlocks = 0;
scratch.freeInodes = 0;
selectedSeatCount = 0;
State = 0;
ContainsSeatTitles = FALSE;
scratch.freeChannels = 0;
scratch.freeBlocks = 0;
scratch.freeInodes = 0;
if (ES_GetTitleId(&scratch.titleId) != 0) {
regionValid = FALSE;
} else {

View File

@@ -205,7 +205,7 @@ void AxAdpcmSimplePlayer::init() {
}
int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
Header* head = mpBNSBuffer = (Header*)data;
mpBNSBuffer = (Header*)data;
sSysPauseFlag = false;
@@ -224,7 +224,6 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
ChannelInfo* chanInfoBufB[2];
ChannelInfo* chanInfoBufA[2];
AdpcmCoeffs** pCoeffsBufB = NULL;
int i;
u32* channelStartOffsets;
INFOBlock* infoBlock;
@@ -240,13 +239,13 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
int chanCount;
{
if (head->byteOrder != 0xFEFF) {
if (((Header*)data)->byteOrder != 0xFEFF) {
chanCount = 0;
goto clean_up;
}
infoBlock = ADD_OFFSET(INFOBlock, data, head->infoHead.offset);
dataBlock = ADD_OFFSET(DATABlock, data, head->dataHead.offset);
infoBlock = ADD_OFFSET(INFOBlock, data, ((Header*)data)->infoHead.offset);
dataBlock = ADD_OFFSET(DATABlock, data, ((Header*)data)->dataHead.offset);
if (infoBlock->head.sig != 'INFO') {
chanCount = 0;
goto clean_up;
@@ -268,8 +267,6 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
pChanInfoBufB = chanInfoBufB;
pChanDataBuf = chanDataBuf;
pCoeffsBufA = coeffsBufA;
pCoeffsBufB = coeffsBufB;
pAxvpbBuf = axVoiceBuf;
for (i = 0; chanCount = infoBlock->channelCount, i < chanCount; i++) {
int chanStartOffs = channelStartOffsets[i];
ChannelInfo* chanInfo = ADD_OFFSET(ChannelInfo, infoBlockDataBase, chanStartOffs);
@@ -278,8 +275,9 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
pChanInfoBufB[i] = chanInfo;
pChanDataBuf[i] = ADD_OFFSET(void, dataBlockDataBase, chanInfo->dataOff);
pCoeffsBufA[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
pCoeffsBufB[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
coeffsBufB[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
pAxvpbBuf = axVoiceBuf;
pAxvpbBuf[i] = AXAcquireVoice(0x1f, VoiceCallback, 0);
if (pAxvpbBuf[i] == NULL) {
chanCount = 0;
@@ -312,37 +310,33 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
axAddr.currentAddressHi = (u32)currAddr >> 0x10;
axAddr.currentAddressLo = (u32)currAddr & 0xFFFF;
axAdpcm.a[0][0] = pCoeffsBufB[i]->a[0][0];
axAdpcm.a[0][1] = pCoeffsBufB[i]->a[0][1];
axAdpcm.a[1][0] = pCoeffsBufB[i]->a[1][0];
axAdpcm.a[1][1] = pCoeffsBufB[i]->a[1][1];
axAdpcm.a[2][0] = pCoeffsBufB[i]->a[2][0];
axAdpcm.a[2][1] = pCoeffsBufB[i]->a[2][1];
axAdpcm.a[3][0] = pCoeffsBufB[i]->a[3][0];
axAdpcm.a[3][1] = pCoeffsBufB[i]->a[3][1];
axAdpcm.a[4][0] = pCoeffsBufB[i]->a[4][0];
axAdpcm.a[4][1] = pCoeffsBufB[i]->a[4][1];
axAdpcm.a[5][0] = pCoeffsBufB[i]->a[5][0];
axAdpcm.a[5][1] = pCoeffsBufB[i]->a[5][1];
axAdpcm.a[6][0] = pCoeffsBufB[i]->a[6][0];
axAdpcm.a[6][1] = pCoeffsBufB[i]->a[6][1];
axAdpcm.a[7][0] = pCoeffsBufB[i]->a[7][0];
axAdpcm.a[7][1] = pCoeffsBufB[i]->a[7][1];
axAdpcm.gain = pCoeffsBufB[i]->cfg.gain;
axAdpcm.pred_scale = pCoeffsBufB[i]->cfg.predScale;
axAdpcm.yn1 = pCoeffsBufB[i]->cfg.yn1;
axAdpcm.yn2 = pCoeffsBufB[i]->cfg.yn2;
axAdpcm.a[0][0] = coeffsBufB[i]->a[0][0];
axAdpcm.a[0][1] = coeffsBufB[i]->a[0][1];
axAdpcm.a[1][0] = coeffsBufB[i]->a[1][0];
axAdpcm.a[1][1] = coeffsBufB[i]->a[1][1];
axAdpcm.a[2][0] = coeffsBufB[i]->a[2][0];
axAdpcm.a[2][1] = coeffsBufB[i]->a[2][1];
axAdpcm.a[3][0] = coeffsBufB[i]->a[3][0];
axAdpcm.a[3][1] = coeffsBufB[i]->a[3][1];
axAdpcm.a[4][0] = coeffsBufB[i]->a[4][0];
axAdpcm.a[4][1] = coeffsBufB[i]->a[4][1];
axAdpcm.a[5][0] = coeffsBufB[i]->a[5][0];
axAdpcm.a[5][1] = coeffsBufB[i]->a[5][1];
axAdpcm.a[6][0] = coeffsBufB[i]->a[6][0];
axAdpcm.a[6][1] = coeffsBufB[i]->a[6][1];
axAdpcm.a[7][0] = coeffsBufB[i]->a[7][0];
axAdpcm.a[7][1] = coeffsBufB[i]->a[7][1];
axAdpcm.gain = coeffsBufB[i]->cfg.gain;
axAdpcm.pred_scale = coeffsBufB[i]->cfg.predScale;
axAdpcm.yn1 = coeffsBufB[i]->cfg.yn1;
axAdpcm.yn2 = coeffsBufB[i]->cfg.yn2;
u32 ratio = infoBlock->sampleRate / 32000.0f * 65536.0f;
axSrc.ratioHi = ratio >> 16;
axSrc.ratioLo = ratio & 0xFFFF;
axSrc.currentAddressFrac = 0;
axSrc.last_samples[0] = 0;
axSrc.last_samples[1] = 0;
axSrc.last_samples[2] = 0;
axSrc.last_samples[3] = 0;
axSrc.last_samples[3] = axSrc.last_samples[2] = axSrc.last_samples[1] = axSrc.last_samples[0] = axSrc.currentAddressFrac = 0;
AXVPB* vpbA = axVoiceBuf[i];
AXVPB* vpbA = pAxvpbBuf[i];
AXSetVoiceType(vpbA, 0);
AXSetVoiceAddr(vpbA, &axAddr);
AXSetVoiceAdpcm(vpbA, &axAdpcm);
@@ -359,7 +353,7 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
Voices[vpbA->index].getMix()->vL = 0;
}
}
AXVPB* vpbB = axVoiceBuf[i];
AXVPB* vpbB = pAxvpbBuf[i];
AXSetVoiceMix(vpbB, Voices[vpbA->index].getMix());
static AXPBVE voiceVe = {32768, 0};
AXSetVoiceVe(vpbB, &voiceVe);

View File

@@ -298,9 +298,8 @@ namespace www {
}
case FORM_ID_DUMMY_SECURITY_KEY: {
memset(pString->asterisks, 0, sizeof(pString->asterisks));
SetStringBuf* strBuf;
int i;
for (i = 0; i < strlen((strBuf = pString)->securityKey); strBuf->asterisks[i++] = '*') {
for (i = 0; i < strlen(pString->securityKey); pString->asterisks[i++] = '*') {
}
if (i > 0x20) {
pString->asterisks[0x20] = '\n';

View File

@@ -537,16 +537,6 @@ int ODHEncodeRGB565(u8* src, u8* dest, int width, int height, u32 sizeLimit, int
return odh.compressGbaOdh(src, dest, width, height, quality, sizeLimit, work, ODH_FORMAT_RGB565);
}
int ODHEncodeRGBA8(u8* src, u8* dest, int width, int height, u32 sizeLimit, int quality, u8* work) {
CArGBAOdh odh;
return odh.compressGbaOdh(src, dest, width, height, quality, sizeLimit, work, ODH_FORMAT_RGBA8);
}
int ODHEncodeY8U8V8(u8* src, u8* dest, int width, int height, u32 sizeLimit, int quality, u8* work) {
CArGBAOdh odh;
return odh.compressGbaOdh(src, dest, width, height, quality, sizeLimit, work, ODH_FORMAT_Y8U8V8);
}
int ODHDecodeRGB565(u8* src, int srcSize, u8* dest, int destSize, u8* work, int unk) {
CArGBAOdh odh;
int result = odh.decompressGbaOdh(src, srcSize, dest, destSize, work, unk, ODH_FORMAT_RGB565);
@@ -559,12 +549,6 @@ int ODHDecodeRGBA8(u8* src, int srcSize, u8* dest, int destSize, u8* work, int u
return result;
}
int ODHDecodeY8U8V8(u8* src, int srcSize, u8* dest, int destSize, u8* work, int unk) {
CArGBAOdh odh;
int result = odh.decompressGbaOdh(src, srcSize, dest, destSize, work, unk, ODH_FORMAT_Y8U8V8);
return result;
}
int ODHGetWidth(u8* data) {
return (((u32*)data)[1] & 0x7FF) + 7 & 0x7F8;
}
@@ -914,7 +898,8 @@ void CArGBAOdh::cdj_c_setQuantizationTable(SArCDJ_OdhMaster* master, u32 quality
for (i = 0; i < 64; i++) {
temp = ((const u16*)gArAANScales)[i];
temp *= quantization[table * 64 + i];
master->quantizationTables[table * 64 + i] = 0x4000000 / temp;
temp = 0x4000000 / temp;
master->quantizationTables[table * 64 + i] = temp;
}
}
}
@@ -931,7 +916,7 @@ void CArGBAOdh::cdj_c_makeHeader(SArCDJ_OdhMaster* master, u32 size) {
s32 CArGBAOdh::cdj_c_colorConv(SArCDJ_OdhMaster* master, u8* sourceData, int format) {
u32 paddedWidth;
u16 width;
s32 width;
u16 height;
u8* workPlane;
int sourceStride;
@@ -1193,7 +1178,8 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
}
}
code = request->dcTable[bitCount];
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (difference & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (difference & ((1 << bitCount) - 1)),
((s32)code >> 24) + bitCount,
request) == ODH_ERROR_80000004) {
return ODH_ERROR_80000004;
}
@@ -1408,7 +1394,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
coefficientIndex = odh_natural_order[naturalIndex];
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
statusOrOffset = ((u32)master->blockY << 6) * (u32)master->blocksWide +
statusOrOffset = (u32)master->blocksWide * ((u32)master->blockY << 6) +
((u32)master->blocksHigh * ((u32)master->blocksWide << 6) +
(u32)master->blockX * 8);
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {

View File

@@ -884,56 +884,64 @@ namespace ipl {
return ret;
}
void ESMisc::DeleteUnauthorizedData(EGG::Heap* heap) {
static char FUNC_VERIFY_SAVEDATA_ZD[] = "verifySavedataZD";
static char FUNC_DELETE_TICKETS_FORCE[] = "DeleteTicketsForce";
static char FUNC_INIT_SAVEDATA[] = "InitSavedata";
s32 ESMisc::DeleteUnauthorizedData(EGG::Heap* heap) {
u32 titleCount = 0;
ESTitleId* titleIds = NULL;
char path[88];
NANDFileInfo fileInfo ALIGN32;
u8 ticketViews[0xe0] ALIGN32;
NANDFileInfo fileInfo ALIGN32;
u32 ticketViewCount;
ESTicketView* ticketViewList;
s32 ret = ES_ListTitlesOnCard(NULL, &titleCount);
if (ret == ES_ERR_OK) {
if (ret != ES_ERR_OK) {
OSReport("%s::%s: Failed to ES_ListTitlesOnCard1: %d\n", __FILE__, FUNC_INIT_SAVEDATA, ret);
} else {
titleIds = (ESTitleId*)heap->alloc(OSRoundUp32B(titleCount * sizeof(ESTitleId)), -DEFAULT_ALIGN);
if (titleIds == NULL) {
OSReport("%s::%s: Unable to allocate\n", __FILE__, "InitSavedata");
OSReport("%s::%s: Unable to allocate\n", __FILE__, FUNC_INIT_SAVEDATA);
} else {
ret = ES_ListTitlesOnCard(titleIds, &titleCount);
if (ret == ES_ERR_OK) {
if (ret != ES_ERR_OK) {
OSReport("%s::%s: Failed to ES_ListTitlesOnCard2: %d\n", __FILE__, FUNC_INIT_SAVEDATA, ret);
} else {
u32 titleIdOffset = 0;
for (u32 i = 0; i < titleCount; i++) {
u32 titleIdHi = *(u32*)((u8*)titleIds + titleIdOffset);
u32 titleIdLo = *(u32*)((u8*)titleIds + titleIdOffset + 4);
u32 titleIdHi = *(u32*)((u8*)titleIds + i * 8);
u32 titleIdLo = *(u32*)((u8*)titleIds + i * 8 + 4);
if ((titleIdLo & 0xffffff00) == 0x525a4400 && titleIdHi == 0x10000) {
if (((((ESTitleId)titleIdHi << 32) | titleIdLo) & 0xFFFFFFFFFFFFFF00ULL) == 0x00010000525A4400ULL) {
u8* saveData = NULL;
BOOL fileOpen = FALSE;
BOOL deleteSaveData = FALSE;
sprintf(path - 8, "/title/%08x/%08x/data/%s", titleIdHi & 0xffffff, titleIdLo, "zeldaTp.dat");
sprintf(path, "/title/%08x/%08x/data/%s", titleIdHi & 0xffffff, titleIdLo, "zeldaTp.dat");
if (!ChangeUid(((ESTitleId)titleIdHi << 32) | titleIdLo)) {
OSReport("%s::%s: ChangeUid failed\n", __FILE__, "verifySavedataZD");
OSReport("%s::%s: ChangeUid failed\n", __FILE__, FUNC_VERIFY_SAVEDATA_ZD);
DeleteTitle(heap, ((ESTitleId)titleIdHi << 32) | titleIdLo);
} else {
ret = NANDPrivateOpen(path - 8, (NANDFileInfo*)((u8*)&fileInfo - 0x20), NAND_ACCESS_READ);
ret = NANDPrivateOpen(path, &fileInfo, NAND_ACCESS_READ);
if (ret == NAND_RESULT_NOEXISTS) {
OSReport("%s::%s: Does not exist %s: %d\n", __FILE__, "verifySavedataZD", path - 8, ret);
OSReport("%s::%s: Does not exist %s: %d\n", __FILE__, FUNC_VERIFY_SAVEDATA_ZD, path, ret);
} else if (ret != NAND_RESULT_OK) {
OSReport("%s::%s: Open save data file failed: %d\n", __FILE__, "verifySavedataZD", ret);
OSReport("%s::%s: Open save data file failed: %d\n", __FILE__, FUNC_VERIFY_SAVEDATA_ZD, ret);
} else {
fileOpen = TRUE;
saveData = (u8*)heap->alloc(0x4000, -DEFAULT_ALIGN);
if (saveData == NULL) {
OSReport("%s::%s: Alloc failed: %d\n", __FILE__, "verifySavedataZD", -2);
OSReport("%s::%s: Alloc failed: %d\n", __FILE__, FUNC_VERIFY_SAVEDATA_ZD, -2);
} else {
memset(saveData, 0, 0x4000);
ret = NANDRead((NANDFileInfo*)((u8*)&fileInfo - 0x20), saveData, 0x4000);
ret = NANDRead(&fileInfo, saveData, 0x4000);
if (ret < 0) {
OSReport("%s::%s: Read file failed: %d\n", __FILE__, "verifySavedataZD", ret);
OSReport("%s::%s: Read file failed: %d\n", __FILE__, FUNC_VERIFY_SAVEDATA_ZD, ret);
} else if (ret != 0x4000) {
OSReport("%s::%s: File size is not correct: %d\n", __FILE__, "verifySavedataZD", ret);
OSReport("%s::%s: File size is not correct: %d\n", __FILE__, FUNC_VERIFY_SAVEDATA_ZD, ret);
deleteSaveData = TRUE;
} else {
u32 offset = 8;
@@ -973,13 +981,13 @@ namespace ipl {
verify_failed:
if (!valid) {
OSReport("%s::%s: Verify failed for %016llx\n", __FILE__, "verifySavedataZD",
OSReport("%s::%s: Verify failed for %016llx\n", __FILE__, FUNC_VERIFY_SAVEDATA_ZD,
((ESTitleId)titleIdHi << 32) | titleIdLo);
deleteSaveData = TRUE;
}
}
NANDClose((NANDFileInfo*)((u8*)&fileInfo - 0x20));
NANDClose(&fileInfo);
fileOpen = FALSE;
if (deleteSaveData) {
DeleteSavedata(((ESTitleId)titleIdHi << 32) | titleIdLo, heap);
@@ -992,7 +1000,7 @@ namespace ipl {
heap->free(saveData);
}
if (fileOpen) {
NANDClose((NANDFileInfo*)((u8*)&fileInfo - 0x20));
NANDClose(&fileInfo);
}
ChangeUid(SYSMENU_TITLE_ID);
continue;
@@ -1006,26 +1014,27 @@ namespace ipl {
((((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x0001000844564458ULL ||
((((ESTitleId)titleIdHi << 32) | titleIdLo) > 0x0001000844564458ULL &&
(((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x000100084449534bULL)))) {
ESTitleId titleId = *(ESTitleId*)((u8*)titleIds + titleIdOffset);
ES_DeleteTitle(titleId);
ES_DeleteTitle(*(ESTitleId*)((u8*)titleIds + titleIdOffset));
ESTitleId titleId = *(ESTitleId*)((u8*)titleIds + titleIdOffset);
ticketViewList = NULL;
memset(ticketViews, 0, sizeof(ticketViews));
ESTicketView* ticketView = (ESTicketView*)ticketViews;
memset(ticketView, 0, sizeof(ticketViews));
ret = ES_GetTicketViews(titleId, NULL, &ticketViewCount);
if (ret != ES_ERR_OK) {
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret, titleId);
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, FUNC_DELETE_TICKETS_FORCE, ret, titleId);
} else if (ticketViewCount != 0) {
ticketViewList = (ESTicketView*)heap->alloc(ticketViewCount * 0xe0, -DEFAULT_ALIGN);
ret = ES_GetTicketViews(titleId, ticketViewList, &ticketViewCount);
if (ret != ES_ERR_OK) {
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret, titleId);
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, FUNC_DELETE_TICKETS_FORCE, ret, titleId);
} else {
for (u32 j = 0; j < ticketViewCount; j++) {
memcpy(ticketViews, (u8*)ticketViewList + j * sizeof(ESTicketView), 0xd8);
ret = ES_DeleteTicket((ESTicketView*)ticketViews);
memcpy(ticketView, (u8*)ticketViewList + j * sizeof(ESTicketView), 0xd8);
ret = ES_DeleteTicket(ticketView);
if (ret != ES_ERR_OK) {
OSReport("%s::%s: ES_DeleteTicket failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret,
((ESTicketView*)ticketViews)->ticketId);
OSReport("%s::%s: ES_DeleteTicket failed: %d for %016llx\n", __FILE__, FUNC_DELETE_TICKETS_FORCE, ret,
ticketView->ticketId);
}
}
}
@@ -1038,18 +1047,14 @@ namespace ipl {
titleIdOffset += 8;
}
} else {
OSReport("%s::%s: Failed to ES_ListTitlesOnCard2: %d\n", __FILE__, "InitSavedata", ret);
}
}
} else {
OSReport("%s::%s: Failed to ES_ListTitlesOnCard1: %d\n", __FILE__, "InitSavedata", ret);
}
if (titleIds != NULL) {
heap->free(titleIds);
}
return;
return ret;
}
BOOL checkForNullTermination(char* str, u32 len) {

View File

@@ -0,0 +1,558 @@
# misc1 attempts
## BS2Update (src/BS2/BS2Update.c) — data ~99.24, code ~92.6
- .bss decode SOLVED: 5 separate non-static GLOBAL decls, NOT a packed work struct.
`u32 Flags0[512]`, `u32 Flags1[512]`, `UpdateThreadData Thread` (OSThread 792B +
`u8 stack[4096]` + `u64 reserved` = 4896B), `BS2UpdateHeader UpdateHeader0/1` (32B).
- .bss EMISSION ORDER = first-use in .text order (decl order irrelevant — verified by
scramble). orig order Flags0,Flags1,Thread,UH0,UH1 requires Flags0 referenced before
Flags1. `pFlags = Flags0;` at Init top materializes &Flags0 first → exact orig layout.
The store is +1 insn vs orig (73 vs 72); insn-free alternatives don't materialize.
- `sizeof(Thread.stack)` must be 0x1000 (orig `li r7,0x1000`) → stack[4096] + 8B tail.
- UpdateThread: 635-diff web-rotation mass (orig bases r21/r22/r26 vs mine r15/r19/r23;
index/counter webs r16-r20 vs mine r14-r21) — allocator-internal tie family.
- Init residual: r30-vs-r3 base choice for Thread args + extra stw — same family.
- .sbss caps at ~79%: orig's 4 anon objects are literally named lbl_81698B10-1C in the
orig .o symtab; semantic decl names can't match (rule 1 bans lbl_ names).
- `.data` tail (orig +5B `780a000000000000` f64) = splits-boundary extraction artifact.
## symbols.txt naming lever (w1003) — VERIFIED WORKING
- Renaming lbl_XXXX symbols.txt entries to semantic names propagates into the
extracted orig .o via the splitter (touch config.yml or it won't resplit).
- Data pairing = RAW SYMBOL NAME equality between the two .o symtabs. Both sides
need a same-named symbol: orig via symbols.txt rename, mine via a real decl.
- BS2Update .sbss: 4 anon objects named RebootRequired/ContainsSeatTitles/
UpdateImportState/UpdateImportResult -> data 10488/10488 (was 79% capped).
- iplESMisc .sdata: 5 objects named to my emitted names (__FUNCTION__$NNNN,
@17944 for "%s%s" literal) + last object size corrected 9->8 (orig extent
included the section pad) -> data 4416/4416.
- www_wiisetting .data: lbl_816440A0 (0x38 merged) split into 4 interior entries
matching my MSG_* / Message decls -> pairs; section now scores (2.05%).
- Non-pairable: anonymous pooled literals/jumptables on MY side (@NNNN) — renaming
orig alone gives no pair (verified: wiiSettingName rename, no score move).
Lifting needs real named decls — wiisetting is Equivalent-linked so source
edits are off-limits; its .data string/jumptable gap (~97%) is an
extraction-boundary artifact (orig merges pooled literals into labeled runs).
- BS2Mach .data same artifact: orig merges ~50 literals into few GLOBAL lbl_
objects + 4 jumptables.
## AxAdpcmPlayer::start (99.78) — parked
- 14 regname diffs: const-zero web r25<->r26 + one r29/r30 mr mirror.
- Tried: remove dead NULL-init (no-op), move sSysPauseFlag store (cascade -300),
p* decl rotation (26 diffs, worse). Same allocator-internal family.
## odh (src/system/odh.cpp) — fuzzy 99.4, data 100%
- Removed ODHEncodeRGBA8, ODHEncodeY8U8V8, ODHDecodeY8U8V8 — absent from orig .o.
- All 6 sub-100 fns verified via raw word-diff (df.py normalization had masked them):
register-web rotations throughout. setQuantizationTable = 5 words (r10<->r11 web),
colorConv = 18, huffmanCoder = 30, decompressLoop = 62, huffmanDecoder = 140+ —
allocator-internal tie family, identical insn streams otherwise.
- LineConv11: 2 sched diffs (lis 0x4330 placement) + lbzux operand-web rotation —
same family.
- Tested symbols.txt semantic rename of a pooled literal (lbl_816945A0): no fuzzy
effect — objdiff does not resolve .o-local syms through the map. Reverted.
- `.data` tail 5B artifact (hufftreePtr extraction boundary).
## BS2Mach / iplSound / www_wiisetting / AxAdpcmPlayer / iplESMisc / wprintf
- Unchanged from prior parked states (see singles/bs2 attempts + in-tree notes):
BS2Mach 7 fns 95-98 (u64-mul, DI-reg, marshal-order walls); iplSound sinit 83.69
(bare-array __construct_array emission wall); wiisetting Getter_ 99.45 (i→r31 web);
AxAdpcmPlayer start 99.78 (r25↔r26); iplESMisc DUD 88.79 + 32B data; wprintf 99.27
(full rotation). All allocator-internal or emission-model walls, no banned tricks.
## w1004 — resume findings
### symbols.txt lever — extended
- Renamed `lbl_81644834` → `strProps__Q23www10wiisetting` (0x64 at .data+0x794): paired → wiisetting matched_data 1180→1280. All legit named pairs now done for that unit; the rest is anon strings + jumptables (unpairable both sides).
### huffmanDecoder (odh) — word-diff analysis
- Diff = fn-wide web rotation, ~140/306 insns. Root cause isolated: PAIRWISE web-class swap — orig homes the hot running-bit web (bitOffset→bitCountAndMask) in callee r31 and `sourceCursor` (bitstream ptr) in VOLATILE r12; mine gives cursor callee r27 and the hot web volatile r10.
- Orig emits load order bytesConsumed(0x20)→bitCount ptr(0x1c)→bitstream(0x10) identical to mine — web creation order same; pure allocator binding difference.
- Tried: decl-order swap of the three init stmts (2 orders: 171 diffs both, worse), s32-vs-u32 types on bitOffset/bitCountAndMask (273, codegen change), removing the maxHuffmanBits copy local (171). All reverted to 140-diff base.
- Root cause guess: MWCC's cost model ranks the cursor web higher in my IR — no source-level lever found that changes class assignment without changing codegen.
### AxAdpcm start — zero-web variants (orchestrator req)
- Pairwise swap: orig const-zero→r25, axSrc stack-addr(+0x28)→r26; mine zero→r26, addr→r25. Plus r28↔r31 mirror web.
- Tried: memset(axSrc.last_samples,0,8) → 18 diffs (store form differs slightly, reverted); assigning fields from sSysPauseFlag → 148 (flag is .sdata load, not const-zero, reverted).
- 14-diff base stays best.
### iplESMisc DUD — verified structural
- 449 vs 438 insns, ~300 word diffs: same family — orig's `ret` web is callee-pinned (r27) producing extra `mr` copies after every call; different .data base web (r21 vs r26). Decode structure is right; web pinning differs fn-wide.
### Remaining state — everything else at documented walls
- All data sections now 100% except www_wiisetting .data (anon literals/jumptables unpairable — extraction-boundary artifacts) and BS2Mach .data (None — merged pooled-literal objects, same artifact).
- All code residuals: allocator-internal web-rotation/marshal-order ties or the above.
## w1005 — live-web-window lever + DUD return decode
### iplESMisc DeleteUnauthorizedData — signature decode (REAL find)
- Orig's `mr r3,r27` immediately before `_restgpr_14` = **the fn returns `ret`** — signature is `s32` (orig: `static s32`, not void). Decl + def updated; `return ret` at end.
- Effect: ret web is now callee-pinned (mine r25, orig r27), epilogue now matches (`mr r3,r25` vs `mr r3,r27`), per-call `mr` copies align structurally.
- Fuzzy 88.79→87.76 (word diffs ~300→339) — fuzzy dipped but the structure is semantically correct (orig really does return a value). Residual = regname rotation + mine emits a second const-zero web (orig CSEs titleCount=0 + titleIds=NULL into one `li r28,0`; mine emits `li r0,0` + `li r26,0`).
- Tried merging the zero webs: decl reorder (405, worse — reverted), `titleIds=(ESTitleId*)titleCount` (339, no change — reverted).
### huffmanDecoder — deeper web analysis
- Orig's callee webs: r23(tableIdx) r24(huffmanTables — reused ×3 for [0],[1],[0] loads!), r28(bytesConsumed) r29,r30(decodedSymbol) r31(bitCount web). Cursor = volatile r12.
- Mine: r24(temp) r25(tables[0]) r26(tables[1]) r27(cursor!) r28 r29 r30(bitCount) r31(decSym) — one extra callee web vs orig's reg-reuse.
- Orig reuses ONE callee reg for the 3 separate `huffmanTables[*]` pointer loads (short-lived webs, reg recycled); mine homes them in 3 different callee regs → pushes cursor into callee, pushing hot web to volatile.
- Tried removing `predictors`/`predictor` locals (extra-web hypothesis): 171 diffs — reverted.
### AxAdpcm start — extra-web variants
- Removed `chanData` local (pass chanDataBuf[i] twice): 208 diffs — reverted.
- Added `AdpcmCoeffs* coeffs = pCoeffsBufB[i]` local (cached member ptr reused ×18): IDENTICAL 14 diffs — kept (more readable, plausibly orig's own form).
## w1006 — AxAdpcm start decode: member-load + direct-array webs
`start` 14 diffs -> 1 (fuzzy 99.962). Verified decodes:
- `mpBNSBuffer = (Header*)data;` member store; `sSysPauseFlag = false;` then
`if (mpBNSBuffer == NULL)` — orig emits `lwz r0,0(r3)` member RELOAD for the
check (the `stb` to the global breaks member CSE), while field reads go
through `(Header*)data` (param r4). No `head` local.
- Removing the `pCoeffsBufB`/`pAxvpbBuf`-mixed structure: direct
`coeffsBufB[i]` uses collapse the coeffsB access to ONE base web (r26) and
resolves the r25<->r26 pairwise swap (const-zero vs coeffsBufB base).
- symbols.txt: orig `lbl_` literals renamed to my emitted names
(`@4196/@4197/@4202` sdata2 fp literals, `voiceVe$3399` sdata) — pairs all
name-bearing diffs. Numbers are MWCC anon-counter values; rename must track
source edits (counter shifts on decl changes).
Remaining 1-diff: hoist-block emits `addi r26,r1,0x28` (coeffsBufB base) one
slot after `addi r17,r1,0x38` (axVoiceBuf base) vs orig's ascending-offset
order. Tried: dead/live pCoeffsBufB alias (rotation), decl-init form, pointer
decl order (r16/r17 rotation), array decl swap (breaks stack offsets),
pAxvpbBuf removal (remat + mass rotation), in-loop assignment (315 vs 316).
Scheduler-internal tie; no source lever found.
huffmanDecoder: `u16* table` single-web decode (reassigned per site) regressed
(185 vs 140) — MWCC SSA-splits the local, adds a 10th callee web
(_savegpr_22). Reverted.
iplESMisc DUD: u64 `titleId` local + `(u32)((titleId>>32)&0xFFFFFF)` /
`NANDTitleIdLo` arg forms — neutral (575 disasm-diff lines both ways); fn-wide
reg-rotation, not localized. Reverted.
## w1007 — wprintf __wpformatter decodes (99.27 -> 99.38)
- `num_chars = ((long)buff_end - (long)buff_ptr) / 2;` — orig emits the
signed byte-diff divide-by-2 sequence (subf + srwi 0x1f + add + srawi); the
plain `wchar_t*` pointer diff emitted subf only.
- `double2hex(long_double_num, buff + 512, *fmt_ptr)` — orig rematerializes
`addi r3,r1,0x480` (r1-relative), same as the long2str/longlong2str/float2str
buf-arg sites; `buff_end`/`buff_end + 1` forms emit member-reg math instead.
- Remaining 130 diffs are a pure 3-web callee rotation: orig binds
buff_end->r15 / buff_ptr->r25 / numChars->r24; mine r25/r24/r15. Identical
insn stream otherwise. Levers tried: buff_end/buff_ptr decl order, &buff[511]
vs +511, buff_ptr=buff init, register/const qualifiers, buff_end+1 reuse —
all no-op.
## w1009 — BS2Update post-rebase (volatile globals + base-web fold)
- `static volatile s32 rc` (decl-site volatile, same mechanism as upstream BS2Mach NAND globals): orig reloads `rc` per access site — 6 loads, volatile decl matches exactly. UpdateThread 92.3 → 93.35, insn count 902 → 904 vs orig 913. `UpdateProgress` volatile also tried — overshoots (20 loads vs orig 11): orig MIXES a callee-cached local with per-access reloads inside the import loop — not fully volatile. Reverted to plain.
- symbols.txt: `@1814/@1826/@1851/@1858` renames pair UpdateThread's sdata strings (propagates into orig .o via resplit).
- BS2UpdateInit: orig keeps `&Flags0` as a callee base web — `addi r30`+offset for `Flags1`(+0x800), `Thread.thread`(+0x1000), `Thread.stack`(+0x1318→+0x1000 top). MWCC won't hoist a single-use address web; `flags` local, `Flags0 + N` expr, and merged `Flags[1024]` all remat per-site. Orig had 3 separate LOCAL bss objects, so the fold needs a source-level `&Flags0` value used ≥2× in Init — none found. Parked (72 vs 71 insns).
- UpdateThread residual: orig uses a distinct `li r15,0` web for the 3 scratch-init stores (r15 = its first-born callee web) vs my shared r0 — allocator priority tie.
- BS2Mach BS2NANDDivideCallback: swapped `NandBuffer += result` before `NandTransferred += result` — resolved the r5↔r6 pairwise web swap (~30→16 diffs). Residual: `li r3,0`/NandCompletion-load scheduling swap + NT/NL/NF marshal order at 3 call sites (arg-eval order, compiler-internal). `u32 remaining` temp regressed (122 vs 128 — orig recomputes per-site).
- odh near-100s (decompressLoop 99.67, setQuantizationTable 99.57, huffmanCoder 99.08, colorConv 98.64, LineConv11 98.08): all verified pure regname/operand-order diffs — same callee-web rotation family, no decode gap.
## w0929 — BS2UpdateInit fold mechanism + AxAdpcm 1-diff (w1015+)
- **`...data.0` literal pool fold**: `extra_cflags=["-sdata 8"]` (configure.py,
committed) makes MWCC emit `lis ...data.0@ha`/`addi ...data.0@l` — a
synthesized per-section literal base — reproducing orig's folded string
codegen AND its exact section layout (.data 0x530 pooled literals +
.sdata 0x11 with @1814/@1826/@1851/@1858 sda21-addressed smalls).
`-O4,p` also pools but 4-aligns literals (orig byte-packs 0x16/0x2c/0x42);
`-str pool` puts all strings in .data@stringBase0 and strips .sdata (orig
has both); `-str pool,readonly` wrong section; `-pooldata on`, `-common on`,
`#pragma pool_data/pool_strings` all no-ops or rejected.
- **Orig Init web map**: 3 callee webs — r29=allocator(param), r30=&Flags0
(.bss fold base: +0x800 Flags1 memset, +0x1000 Thread.thread ×2,
+0x1318 stack base then +0x1000 size), r31=...data.0 pool — all
materialized in prologue, savegpr_29 + frame 0x20.
- **Merged-struct experiment** (`static BS2UpdateData UpdateData` +
member #defines): reproduces orig's .bss fold offsets EXACTLY (struct
total 0x2360 = orig .bss size) but destroys data pairing — orig .bss
is carved into 5 LOCAL objects (Flags0/Flags1/Thread/UpdateHeader0/1)
and objdiff data pairing is raw name equality (10488→104). Reverted to
5 separate decls. Residual diffs even under struct: base materializes
mid-fn not prologue (allocator won't dedicate a 3rd callee reg — cost
model, same 4-use web both sides), one-step +0x2318 vs orig two-step
+0x1318/+0x1000 (every source form folds — stackBase local, threadData
local, u64[512] stack, &arr[0]/&arr[512], (u8*)cast — MWCC constant-folds
all), reg-binding order swap. 15 insns still differ → 79.88%.
- **AxAdpcm `start` 1-diff (99.962)**: orig emits frame-base addis in
ascending order +8,+0x10,+0x18,+0x20,+0x28,+0x38; mine puts +0x38
(axVoiceBuf via `pAxvpbBuf` pre-loop assignment) before +0x28
(coeffsBufB direct, loop-hoisted). Orig's +0x38 is a loop-IV (body-use
order after coeffsBufB) — implies orig had no pre-loop pAxvpbBuf
assignment OR used axVoiceBuf[i] directly. Every variant rotates the
entire callee allocation: remove alias, direct use w/ dead assign,
2-member struct, decl-init `= axVoiceBuf` (moves +0x38 to fn ENTRY —
closest alternate ordering), in-loop assignment, decl-first/decl-last —
all mass-rotate. The web set is exquisitely balanced at the committed
form. Parked at 1-diff.
## w0929 — AxAdpcm 1-diff RESOLVED + BS2Update lever check (w1016)
- **AxAdpcm `start` SOLVED — 0 diffs, unit flipped to Matching.** The
winning form: keep `AXVPB** pAxvpbBuf` decl but move its assignment
INSIDE the loop right before first use
(`pAxvpbBuf = axVoiceBuf; pAxvpbBuf[i] = AXAcquireVoice(...)`), and
route ALL in-loop uses through it (`pAxvpbBuf[i]` for the acquire
store, null-check, and the vpbA/vpbB reads), while the clean_up loops
keep direct `axVoiceBuf[i]` (orig remats `addi r6,r1,0x38` there).
The in-loop DEF births the &axVoiceBuf web after coeffsBufB's (use
order 279<281) so its addi hoists to position 6; the web is still
callee-pinned (r17) because the named local crosses calls inside the
iteration. Prior "in-loop assignment" failure mixed `pAxvpbBuf[i]` and
direct `axVoiceBuf[i]` uses — two competing webs → rotation. Verified:
fuzzy 100.0 all 13 fns, matched_code 3088/3088, matched_data
6476/6476, DOL sha1 intact after Object(Matching) flip.
- Also tried this pass: for-init `i = 0, pAxvpbBuf = axVoiceBuf` (same
swap — init materializes pre-loop), `AdpcmCoeffs** pCoeffsBufB` extra
alias (84-line rotation — extra live web), pure direct `axVoiceBuf[i]`
with no alias (191 — &axVoiceBuf demoted to per-use remat, 6th callee
web lost → cascade), swap roles pCoeffsBufB-alias + axVoiceBuf-direct
(189 — same demotion).
- **BS2UpdateInit scoped-switch lever: inapplicable** — Init is
straight-line (reports, version reads, field stores, memsets,
OSCreateThread/OSResumeThread); the `switch (SCGetProductArea())` and
`OSGetPhysicalMem2Size()` branches all live in UpdateThread.
UpdateThread's residual is the 437-line callee-web rotation (orig
births many distinct const-0 webs r15/r17/r18 + scratch base r22 vs
my shared zeros r20/r21 + base r23) — not a switch-dispatch shape;
call structure already identical (3× SCGetProductArea, same sites).
## w0929 — BS2UpdateInit fold via early &Flags0 def (w1017)
- **BS2UpdateInit 79.88 → 94.0**: `pFlags = Flags0;` after the first
BS2Report materializes &Flags0 as an early-def web → MWCC anchors a
dedicated callee reg (r30) to the .bss base, exactly reproducing orig's
fold: `addi r3,r30,0x800` (Flags1 memset), `addi r3,r30,0x1000`
(Thread.thread ×2), `addi r6,r30,0x1318` (stack). Frame 0x20 +
savegpr_29 match orig. Reloc evidence: orig's r30 targets symbol
`Flags0` (not `...bss.0`) — MWCC anchors the fold to the first .bss
object when an &Flags0 web exists; without one it remats per-object
(Flags1/Thread separately) instead of folding.
- **Residual (9 filtered diffs)**: (a) the pFlags store is +2 insns orig
provably lacks (store-run order matters — best fuzzy is pFlags right
after first BS2Report; before MemAllocator or after EntriesCount are
~91); (b) orig's stack-top arg is two-step `addi r6,r30,0x1318` +
`addi r6,r6,0x1000` — `&Thread.stack` as a distinct web then +sizeof.
MWCC folds `stack + sizeof` into one addend (memberoff+size) on the
live &Thread web (r3+0x1318) under every form tried: decl-init local,
+= reassign, (u32)/(u8*) casts, literal 4096, `(u8*)&Thread+sizeof(Thread)`,
`&arr[sizeof]` — all fold. The two-step needs &Thread.stack materialized
BEFORE arg1's &Thread web — scheduler-internal eval order, no lever.
- pFlags semantic: Init defaults the flag-pointer to Flags0;
UpdateThread rebinds to Flags1 (line 418). Plausible init, honest C —
but orig's Init has no pFlags store, so this is the "early-def"
substitute for orig's internal fold trigger.
## w1018 — odh: setQuantizationTable flip + symbol-name pairing
- **cdj_c_setQuantizationTable → 100%** (99.57): `temp = 0x4000000 / temp;`
`master->quantizationTables[...] = temp;` — the result-through-temp web
split puts the division result back through `temp`'s web, matching
orig's reg layout (0x400 const → r10, byte load → r11). Plain
`0x4000000 / temp` inline in the store kept a 3-reg split.
- **symbols.txt literal pairing for odh .sdata2**: renamed orig's
lbl_816945A0..C0 float/double literals to the emitted @NNNN names —
the renames propagate into orig .o on resplit and pair with my
emitted symbols (LineConv11's 10 symbol-name diffs eliminated).
- **Residuals**: LineConv11 98.08 (pixel/pixelSource web homes — pixel
callee-pinned r25 in orig, volatile r8 in mine; lbzux ptr-update
fused into byte0 load both sides, only reg homes differ);
huffmanCoder 98.77 (same EmitBit arg web family — orig reuses the
`code` load reg destructively for srawi, mine keeps it in a 3rd reg);
colorConv 98.63, decompressLoop 99.67, huffmanDecoder 95.57 — all
the same documented web-rotation family.
## 2026-10-02 — BS2Mach data carving + CheckBS2/DivideCallback decodes
### NEW TECHNIQUE: symbols.txt inner-literal carving (merged literal runs)
Orig's splitter merges contiguous unlabeled literal runs into ONE lbl_ object
(BS2Mach .data had lbl_81645DE4 @0x3c size 0x3b8 covering ~35 separate string
literals). Adding a symbols.txt entry at EACH inner literal's DOL address
(`@NNNN = .data:0x81645DXX; // type:object size:0xYY data:string`) makes the
splitter carve the run into separate objects at exactly the boundaries my .o
has — offset+size pair. Renamed the 3 merged-run start lbl_ to my first
literal's @name, added 84 inner entries (also 4 jumptable + 4 sdata renames).
Result: .data fuzzy 16.1 → 91.1% (remaining = jumptable relocs into the
unmatched fns). matched_data measure unchanged (pairs count completeness).
### CheckBS2CommandStatus 95.46 → 99.51 (1-insn left)
- `CacheCommandComplete = NandPending` → `= 1` (volatile global read forced
an extra lwz; orig wrote literal 1).
- Store-interleave decode: orig emits `stw NP; lwz CL; stw CC; addi+stw CL`
— the CC store lands INSIDE the CacheLength update. Reproduced with a
temp for the new length: `{ u32 newLen = CacheLength + X;
CacheCommandComplete = 1; CacheLength = newLen; }` — the temp pushes the
CC store between the operand load and the final add/store.
- Case 0x12 (OSRoundUp32B): orig computes `(CacheLength + round) + 32` —
`add` then `addi 0x20` — but `round+32` CSE'd into newLen when the Async
arg had the identical `OSRoundUp32B(X) + 32` text. Broke the shared VN by
writing the arg's scaling as `<< 3` instead of `* sizeof` — newLen then
emitted orig's add+addi shape and the whole 3-web rotation collapsed to
1 insn. Residual: orig's `stw CC` fills the load-use gap right after
`lwz partitionCount`, mine sits one slot later (scheduler freedom;
`count` locals rotate the whole allocation — rejected).
### BS2NANDDivideCallback → 100% FLIPPED
- `static u32 CancelNand` → `static volatile u32` — the volatile
NandCompletion fp-load was hoisting before the plain CancelNand store;
volatile-volatile ordering pins it after (matches orig's emit order).
- Per-site arg-temp decode: `{ u32 rem; ...Report...; rem = NandLength -
NandTransferred; ret = NANDxAsync(..., rem, ...); }` — the temp's
computation emits the subf-operand loads FIRST (orig's marshal order),
vs inline arg3 which made MWCC load arg1 first. A SHARED `remaining`
local crosses calls and callee-pins (regresses to mass rotation) —
per-arm temps die after the call and stay volatile.
### Twins BS2NANDDivideReadAsync/WriteAsync 95.74 (1-insn each)
Orig emits `lis r6,cb` BEFORE `lwz r3,NandFile`; mine swaps. Per-site
`NANDCallback cb` local folds — MWCC rematerializes the constant at use.
Pure scheduler placement of an independent lis — documented tie.
### BS2StartGCGame 96.75 residual
- `time = (OS_BUS_CLOCK >> 2) * (OSTime)seconds` — operand order fix
(orig mulhwu(bus4,sec) not mulhwu(sec,bus)).
- Head weave: orig bundles `li 1, lis r30, lis r31, stw, addi r30, addi
r31` — splits webs around the StartingGame store. Not volatile-driven
(tried volatile StartingGame — no-op). Scheduler weave, no lever.
- Mul-chain reg rotation: orig rtc-load→r5 / seconds→r7 / bus4→r5 vs mine
r0/r5/r7 — eval order identical, homes rotated; local forms all regress.
### BS2UpdateInit fold residual (documented, unchanged)
Orig r30=&Flags0 materializes in the prologue and EVERY .bss address folds
onto it (&Thread = r30+0x1000, &Thread.stack = r30+0x1318, then +0x1000
as a separate pointer-arith addi — NOT folded into the member offset).
Mine anchors &Thread.stack+size onto the &Thread web (r3+0x1318). 7
source forms all fold identically. Orig's fold anchor = section-base
(Flags0@bss+0); my `pFlags = Flags0` store reproduces the r30 web at +2
insns (orig has no Init-side pFlags store — its fold trigger is internal).
### BS2StartGame / BS2StartGCGame shared head weave (both ~7 diffs)
Orig emits `li r0,1; lis r29,lis r30; stw r0,StartingGame@l(r29); addi r29;
addi r30; addi r3,r29,0x840; lwz state` — the StartingGame store folds onto
the raw lis-half base web (its own @l offset) BEFORE the CoverBlock addi
exists. Mine hoists `addi r3,&CoverBlock` above the store and folds the
store onto r3 as `(SG-CB)@l(r3)`. Volatile StartingGame/vu32 HW reg/stmt
reorder/anon base all no-op — batch-vs-lazy base materialization is
scheduler-internal. StartGame also has the diAddr r3↔r4 2-web rotation
(diBits built `li 2; ori 4` — orig binds base r4/val r3, mine swapped;
remat'd-base and decl/stmt reorder all keep r3-first binding).
### BS2Tick 98.16 (1940 insns, 1124 diff lines)
Mass callee-window rotation: orig savegpr_26 (17 callee regs live) vs mine
_27 — ONE extra web pinned. Clusters of `lis rX,-0x8000` +member-offset
loads identical but bound to different callees (r26↔r27). DvdProgress
store weave same family as above. Finding which web orig remat'd instead
of pinning = the remaining decode; 1940-insn scale, not yet found.
## 2026-10-02b — odh s32-width + mullw operand order; BS2UpdateInit arg4 split
### odh decodes (kept)
- `s32 width` in cdj_c_colorConv: binds the width web to r8 (orig) vs r7
(u16) — volatile-reg class shift from the wider type. 36 diffs = floor;
remaining is dim/mask r7↔r9 + cbPlane/stride r22↔r29 pairwise swaps —
every decl-order permutation fixes one web and rotates the whole map
(padMask temp 38, stride-decl-last 58, ternary 58 — all worse).
- decompressLoop: `blocksWide * (blockY << 6)` operand order fixed at the
~1397 site (orig mullw(bw,by6) — had written by6-first). 86 diffs = pure
web rotations + add-operand commuting (MWCC commutes add operands by web
availability — source order can't pin them).
- huffmanCoder: 3x repeated lwzx/split sites — orig keeps entry in the
table-base reg and splits lo→r0/hi→r5-reuse; rotation family, `|`
operand swap tested worse (38 vs 36).
### BS2UpdateInit residual (39 diffs, precisely characterized)
- Orig NEVER stores pFlags in Init (UpdateThread sets it later) — but my
`pFlags = Flags0` store is the only source form found that materializes
the &Flags0 fold-base web. Without it: 63 diffs (all .bss folds collapse
to per-access lis). With it: +2 insns net-1 (73 vs 72). The stw's VALUE
needs `addi r0,r30,0` — MWCC won't reuse r30 directly for the SDA store.
- arg4 two-step: orig emits `addi r6,r30,0x1318` (&Thread.stack) then
`addi r6,r6,0x1000` (+sizeof) — arg4's &stack VN materializes BEFORE
arg1's &Thread (marshal eval order), so the +0x1000 can't merge into
the live &Thread web. Mine emits arg1 first, then folds arg4 to
`r6,r3,0x1318`. Named stackTop/stack locals, early assignment, split
stmts, &arr[i] — all fold to the single addi (MWCC remats the VN to the
cheapest form at use site).
- Store-first ordering (before BS2Report): 47 — worse.
### Twins (95.74, 1 insn each) — scheduler tie confirmed
Orig materializes the callback `lis r6` FIRST in the else-arm marshal
(before all arg loads); const-arg placement is scheduler freedom. `&`of,
per-site temps (changes marshal order not the lis slot), branch-polarity
swap (worse — arm order regresses). Same class as CheckBS2's `stw CC`
one-slot residual.
### BS2StartGame/StartGCGame shared head weave + diAddr
`StartingGame = TRUE; while (CoverBlock.state)` — orig stores via
`StartingGame@l(r29)` before the CoverBlock addi materializes; mine folds
the store onto the r3=&CoverBlock web. volatile decl / vu32 HW reg /
stmt reorder / anon base all no-op. diAddr r3↔r4 swap: diAddr/vu32/anon-
base/decl-order all keep base-first binding.
## 2026-10-02c — BS2Mach .data name-pairing complete; jumptable residual is code-bound
- All 95 .data literal objects now pair: renamed orig's carved labels in
symbols.txt to MWCC's emitted names (@NNNN numbering) offset-for-offset.
Names, offsets, sizes, bytes AND relocs are identical — the section is
content-complete (mine 0xbcc vs orig 0xbd0 = one 4B alignment pad tail).
- matched_data stays 155504/158528 because it only counts 100%-fuzzy
sections. .data fuzzy 94.03 is bounded by the two BS2Tick jumptables
(@4359/@4358): their entries resolve to `BS2Tick+<case-offset>` and my
BS2Tick is 0x14 shorter at those labels — every label-target diff is a
code artifact, not an extraction artifact. .data can only complete after
.text does.
### Getter_ (wiisetting's only code blocker, 28 diffs = 2 regname pairs)
- Loop1 `i` (FORM_ID_SECURITY_KEY): orig r26, mine r25.
- Loop2 `i` (FORM_ID_DUMMY_SECURITY_KEY): orig r31, mine r25 — orig pins
it at the deepest callee reg (more callee webs live in that region).
- Tried: for-init decl (scoping error — i used after loop), decl-before-
memset (no-op), shared `int i` at switch scope (42 — worse). Baseline
stands: per-case `int i` decls.
- Unit is Equivalent — orig .o links; this is score-only.
### Twins/CheckBS2 1-insn slots — volatile already semantically applied
`CancelNand`/`CacheCommandComplete` are `static volatile`/`vu32` globals
already (callback/cache-command flags — genuine async semantics). The
lis/stw materialization slots are pure scheduler order, no further lever.
## pass 2026-09-30b (BS2Tick callee-window + Getter_ rotation retry)
### BS2Tick — bootArea decode LANDED
- orig emits `_savegpr_26` (6 callee webs). Decoded the 6th web as TWO separate
`0x80000000` webs in case 9/10: r26 = `bootDisc` field reads live across the 4
strncmp calls, r27 = the strncmp arg base. `char *bootArea` local assigned
inside `if (bootDisc->rvlMagic == 0x5d1c9ea3)` and used as the strncmp arg
reproduces the two-web structure; savegpr_26 matches. Raw literal → volatile
`lis` (wrong); fn-scope shared bootDisc → regression.
- Arm-layout: `if (GamePartition != 0) {State=37;} else {State=54; break;}` —
orig wanted beq-to-out-of-line-arm. LANDED.
- Hoisted field: `u32 gamePartition = ((DVDPartitionInfo*)GamePartition)->partition`
local at case-0x25 top → orig loads field pre-BS2BootFromCache branch. LANDED.
- `BannerAllocation + 0x20 - (BannerAllocation & 0x1f)` → orig's clrlwi+addi+subf
(OSRoundDown32B emits rlwinm+addi = wrong codegen). LANDED.
- `u8 streaming` cached local (block-top decl, C89) — near-match order.
- `*(vu32*)0x8000002c`/`*(vu16*)0x800030e6` qualifiers — no-op, kept (semantically
justified HW-reg accesses).
- Progress: 1935→1938 insns vs orig 1940; text diffs ~1130→1123.
### BS2Tick residual — all verified scheduler/web-ordering family
- o249/254: orig remats `lis -0x8000` per-block (3 block-local webs) vs my CSE'd
shared r4 web. Const-CSE scope is allocator-internal.
- o1151: `bge;b` vs `blt` titlePrefix<U — MWCC always folds to blt (3 forms tried:
nested if, duplicated tail, label-inside-arm — all emit blt).
- o40/480/1470/1620/1831: store-value web bound to arg reg (r6/r4) + li-const
hoisting order — statement-reorder variants all no-op or regress.
- bootDisc-in-0xb r26 pin vs my r3; r26↔r27 binding swap; &0x800030d4 r6 vs r0.
### Getter_ (www_wiisetting) — 28 pure regname diffs, all levers exhausted
- Tried: shared fn-scope `int i` (42-regression), early-init before surrounding
calls (32, worse — orig emits init at loop head), while-loop form (identical
codegen), case-block scope decl (identical), for-init decl, decl reorder.
- Orig puts loop-B `i` at r31 — orig frees r31 (string-base web) just before the
loop; MWCC's global ordering gives the loop counter the freed deep slot. Mine
consistently picks r25 (lowest free). Deterministic allocator ordering; no
source-level lever found that shifts the class without rotating everything.
## pass-2026-09-30c — UpdateThread volatile decode (verdict: landed)
`volatile int State` + `static vu32 EntriesCount` — both are thread-state globals
(State is read by BS2UpdateState/BS2GetUpdateEntry getters from other threads;
EntriesCount is the entry-count the getters expose). Semantically justified, same
class as the BS2Mach callback flags. Effect:
- Orig emits per-exit `li 5; stw State` at the two MEM2-default sites — mine had
DCE'd them (selection_done's `if(EntriesCount==0)` stores State=5 anyway).
Volatile EntriesCount also produces orig's `stw r17; lwz r0` store-then-reload
of EntriesCount where mine forwarded the reg value.
- UpdateThread 904→909 insns (orig 913), diffs 959→505, fuzzy ~92→94.30.
- Broader volatile set (StartUpdate/CancelUpdate/RebootRequired/CurrentEntry/
ContainsSeatTitles/UpdateImportState/UpdateImportResult/pEntries/pFlags/
MemAllocator) = -0.45 fuzzy vs the two-var set; UpdateProgress volatile adds
+9 insns (overshoots 913→922, diffs 505→521). All reverted; kept exactly
State + EntriesCount.
Residual (all documented ties): ~500 regname diffs — r15↔r18/r19↔r14/r22↔r23
web rotations; 4-insn deficit = orig's per-site `li r3,0`/`lwzx` reloads
(marshal-order + aliasing ties); no structural gaps remain — store/load order
and branch shape now align.
## pass-2026-09-30c — Getter_ web-binding tie (verified, 14 word diffs)
Getter_ is instruction-identical (609 insns both, ndiff 0, relocs identical
modulo symtab index). Entire residual = 14 word diffs, two sub-cases:
- DUMMY_SECURITY_KEY loop IV `i`: orig r26, mine r25 (pString-load webs swap
r25<->r26 to compensate).
- EUR-region LUT loop IV `i`: orig r31, mine r25. `li r31,0` at orig 0xb68 is
born with r25-r30 all occupied (orig holds extra callee webs live there).
Orchestrator's post-loop-use theory for r31 REFUTED: orig's EUR `i` dies inside
its loop (blt 0xb70 is the loop-back edge; nothing reads r31 after). The deep
pin comes from liveness at birth, not post-loop use.
Scope experiments (all built + measured, reverted):
- Shared fn-top `int i` across SC_KEY+DUMMY+EUR: DUMMY i->r28, EUR i->r26
(moved but overshot both targets r26/r31).
- Shared SC_KEY+DUMMY only: DUMMY r28, EUR r25.
- Shared DUMMY+EUR only: DUMMY r25, EUR r26.
- `int i = 0` before memset (web spans call): 18 diffs, regression.
- `int i` decl moved before memset (uninitialized): no change (14).
- `for (int i = 0;` init-decl: doesn't compile (i used post-loop).
Conclusion: orig's deeper pins require extra callee-pinned webs that no decl-
scope form reproduces; allocator-internal ordering. Documented wall.
## pass-2026-09-30d — DUD titleId web decode (iplESMisc)
DeleteUnauthorizedData 87.76→89.53, insns now EXACT 449/449, diffs 240.
Root-caused the tail-block deficit: orig does NOT hold `titleId` in a local
u64 — it re-reads `*(ESTitleId*)((u8*)titleIds + titleIdOffset)` per use:
- ES_DeleteTitle marshal = `add r4,r28,r24; lwzx r3; lwz r4,4(r4)` fresh load
- memset/GetTicketViews section loads the pair ONCE into callee r15/r16
(`lwzx r15,r28,r24; lwz r16,4(r4)` at 0x223c) which serves ALL later
OSReport/GetTicketViews marshals (`mr r7,r15; mr r8,r16`).
Winning source form:
ES_DeleteTitle(*(ESTitleId*)((u8*)titleIds + titleIdOffset));
ESTitleId titleId = *(ESTitleId*)((u8*)titleIds + titleIdOffset);
// all later uses via titleId
Failed variants: (a) `ESTitleId titleId = *(ESTitleId*)(...)` single local
(BEFORE this pass's edit — MWCC emits a stack struct copy + extra pointer
web: 448 insns, 262 diffs); (b) `titleId = hi<<32|lo` built from the live
u32 pair — cleaner regs (441 insns, 89.10) but loses orig's reload shape;
(c) inline deref at ALL 4 use sites — 450 insns, fuzzy 85.52 (reloads
can't fold into the single callee pair).
Orig's u64 compare-tree idiom also verified: hi-const base materialized
once (`lis r23,0x00010000` then `addi r0,r23,{1,8}` per test), lo-consts
via `r14 = lis 0x4449` + `addi r3,r14,{0x5343,0x534b}` or `lis+addi`;
each equality test = xor/xor/or./beq; ordering tests = subfc/subfe/subfe/neg.
Mine already matched that shape.
Residual 240 diffs = callee-web rotation (titleIdHi/Lo pair r21/r22 vs
orig r19/r20, ret marshal homes, ticketViewList/heap regs) + the 1-insn
`addi r?,r?,8` extra offset web — same allocator-tie family as the rest
of the leaf.
## pass-2026-09-30e — UpdateThread lwzx reload + wpformatter def-order
UpdateThread residual rechecked: orig emits TWO `lwzx r0,r18,r4` loads of
`discEntries[UpdateProgress].type` (0xce8 + 0xd00) — mine CSEs to one and
reuses r0 across the block edge. Tried `CurrentEntry->type` for the second
check → emits `lwz r0,0(r3)` (wrong form, +1 insn, reverted). Orig's second
lwzx is a non-CSE'd re-read of the same indexed expr — a value-numbering
artifact with no clean source form found (banned volatile-cast would force
it; skipping per owner rules).
wpformatter prologue ordering characterized: orig binds buff_end→r15
(deepest callee pin) and the rodata-pool base→r16; mine binds pool→r16,
buff_end→r25. Both are prologue-materialized consts whose addi order
differs by one slot (r16-addi before buff_end-addi in orig). Tried
uninit-decl + assign after `chars_written = 0` → materialization position
unchanged (MWCC hoists loop-invariant consts regardless of def site).
Same 3-web rotation wall; reverted.