Compare commits
5 Commits
cleanup/ip
...
agent/w092
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ce5c0fa3c0 | ||
|
|
5bd429bb96 | ||
|
|
08c817a452 | ||
|
|
99f32d7246 | ||
|
|
9e17cf9dd1 |
@@ -44,7 +44,7 @@ UpdateDiskID = .bss:0x810ADF60; // type:object size:0x20 align:32 data:4byte
|
||||
TicketViewsBuf = .bss:0x810ADF80; // type:object size:0x3600 scope:local align:32
|
||||
Flags0 = .bss:0x810B1580; // type:object size:0x800 scope:local
|
||||
Flags1 = .bss:0x810B1D80; // type:object size:0x800 scope:local
|
||||
Thread = .bss:0x810B2580; // type:object size:0x318 scope:local
|
||||
Thread = .bss:0x810B2580; // type:object size:0x1318 scope:local
|
||||
UpdateHeader0 = .bss:0x810B38A0; // type:object size:0x20 scope:local
|
||||
UpdateHeader1 = .bss:0x810B38C0; // type:object size:0x20 scope:local
|
||||
viewsBuf = .bss:0x810B38E0; // type:object size:0x3600 scope:local
|
||||
@@ -103,7 +103,7 @@ AtermThread = .bss:0x810C0958; // type:object size:0x318 scope:local align:32
|
||||
Voices = .bss:0x810C0C80; // type:object size:0x1800 data:4byte
|
||||
sZeroMem = .bss:0x810C2480; // type:object size:0x100 data:byte
|
||||
s_player_thread_stack = .bss:0x810C2580; // type:object size:0x4000 scope:local
|
||||
lbl_810C6580 = .bss:0x810C6580; // type:object size:0xC
|
||||
lbl_810C6580 = .bss:0x810C6580; // type:object size:0x10
|
||||
layoutGatherDestructorRecord = .bss:0x810C6590; // type:object size:0xC data:4byte
|
||||
unInputedWCharColorDestructorRecord = .bss:0x810C659C; // type:object size:0xC data:4byte
|
||||
charColorDestructorRecord = .bss:0x810C65A8; // type:object size:0xC data:4byte
|
||||
@@ -4577,11 +4577,11 @@ enqueueLoadNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB308; // type:f
|
||||
enqueuePageNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB364; // type:function size:0x5C
|
||||
enqueueResultNotice__Q33ipl5scene15SDChannelSelectFUl = .text:0x813DB3C0; // type:function size:0x5C
|
||||
enqueueChannelNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB41C; // type:function size:0x5C
|
||||
enqueueMoveNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB478; // type:function size:0x5C
|
||||
enqueueMoveNotice__Q33ipl5scene15SDChannelSelectFUx = .text:0x813DB478; // type:function size:0x5C
|
||||
enqueueStateNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB4D4; // type:function size:0x5C
|
||||
enqueueErrorNotice__Q33ipl5scene15SDChannelSelectFUlUl = .text:0x813DB530; // type:function size:0x5C
|
||||
enqueueCommandNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB58C; // type:function size:0x60
|
||||
enqueueDeleteNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB5EC; // type:function size:0x60
|
||||
enqueueErrorNotice__Q33ipl5scene15SDChannelSelectFPPUxPPUx = .text:0x813DB530; // type:function size:0x5C
|
||||
enqueueCommandNotice__Q33ipl5scene15SDChannelSelectFPPUxPPUxPPUx = .text:0x813DB58C; // type:function size:0x60
|
||||
enqueueDeleteNotice__Q33ipl5scene15SDChannelSelectFUx = .text:0x813DB5EC; // type:function size:0x60
|
||||
clearCommandQueue__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB64C; // type:function size:0x40
|
||||
clearNoticeQueue__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB68C; // type:function size:0x40
|
||||
processWorkerCommands__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB6CC; // type:function size:0x518
|
||||
@@ -22240,7 +22240,7 @@ lbl_81696CD2 = .sdata:0x81696CD2; // type:object size:0x7 data:string
|
||||
@12747 = .sdata:0x81696CE2; // type:object size:0x4 scope:local data:wstring
|
||||
@12851 = .sdata:0x81696CE6; // type:object size:0x7 scope:local data:string
|
||||
@12910 = .sdata:0x81696CED; // type:object size:0x8 scope:local data:string
|
||||
lbl_81696CF8 = .sdata:0x81696CF8; // type:object size:0x3 data:string
|
||||
sCardSlotName__Q23ipl10memorycard = .sdata:0x81696CF8; // type:object size:0x3 data:string
|
||||
@2405 = .sdata:0x81696D00; // type:object size:0x7 scope:local data:string
|
||||
@2437 = .sdata:0x81696D08; // type:object size:0x6 scope:local data:string
|
||||
@2438 = .sdata:0x81696D0E; // type:object size:0x3 scope:local data:string
|
||||
|
||||
@@ -188,7 +188,7 @@ namespace ipl {
|
||||
static const char* mscClockPaneNames[3];
|
||||
static const char* mscMaskPaneName;
|
||||
|
||||
#if defined(IPL_SD_CHANNEL_TITLE_CPP) || defined(IPL_SD_CHANNEL_OBJ_CPP)
|
||||
#if defined(IPL_SD_CHANNEL_TITLE_CPP) || defined(IPL_SD_CHANNEL_OBJ_CPP) || defined(IPL_SD_CHANNEL_MEMORY_CPP)
|
||||
public:
|
||||
#else
|
||||
private:
|
||||
@@ -204,11 +204,11 @@ namespace ipl {
|
||||
bool enqueuePageNotice();
|
||||
bool enqueueResultNotice(u32 result);
|
||||
bool enqueueChannelNotice(u64 titleId, u32 value);
|
||||
bool enqueueMoveNotice(u32 controller, u32 page, u32 index);
|
||||
bool enqueueMoveNotice(u64 titleId);
|
||||
bool enqueueStateNotice(u64 titleId, u32 state);
|
||||
bool enqueueErrorNotice(u32 page, u32 index);
|
||||
bool enqueueCommandNotice(u32 page, u32 index, u32 command);
|
||||
bool enqueueDeleteNotice(u32 controller, u32 page, u32 index);
|
||||
bool enqueueErrorNotice(ESTitleId** titleIds, ESTitleId** secondaryTitles);
|
||||
bool enqueueCommandNotice(ESTitleId** titles, ESTitleId** secondaryTitles, ESTitleId** names);
|
||||
bool enqueueDeleteNotice(u64 titleId);
|
||||
void clearCommandQueue();
|
||||
void clearNoticeQueue();
|
||||
void calcChannelObjects();
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace nw4r {
|
||||
} // namespace detail
|
||||
|
||||
template <typename TDerived, typename TBase>
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP) || defined(IPL_SD_CHANNEL_TITLE_CPP)
|
||||
TDerived DynamicCast(TBase* pPtr);
|
||||
#else
|
||||
inline TDerived DynamicCast(TBase* pPtr) {
|
||||
|
||||
@@ -795,9 +795,8 @@ iconSpeedDone:
|
||||
break;
|
||||
case 0: {
|
||||
paletteSize = 0;
|
||||
u8* iconPalette =
|
||||
&sThread->icons[slot][fileNo].iconFmt[iconCount];
|
||||
*iconPalette = iconPalette[-1];
|
||||
sThread->icons[slot][fileNo].iconFmt[iconCount] =
|
||||
sThread->icons[slot][fileNo].iconFmt[iconCount - 1];
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#define IPL_SD_CHANNEL_MEMORY_CPP
|
||||
#define IPL_SDMEMORY_TITLE_CACHE_ACCESS
|
||||
#define IPL_SDMEMORY_SCROLLER_INIT_OUT_OF_LINE
|
||||
#define IPL_SDMEMORY_SET_TRANSLATE_OUT_OF_LINE
|
||||
@@ -33,17 +34,6 @@ extern "C" bool iplSDChannelSelect_813DDB74(ipl::scene::SDChannelSelect* channel
|
||||
ipl::scene::SDMemory::TitleRange* sdTitles,
|
||||
ESTitleId* titleIds, wchar_t* titleNames, u32* titleCount,
|
||||
s32 state);
|
||||
extern "C" bool iplSDChannelSelect_813DB5EC(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId titleId);
|
||||
extern "C" bool iplSDChannelSelect_813DB4D4(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId titleId, u32 flags);
|
||||
extern "C" bool iplSDChannelSelect_813DB530(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId** titleNames, ESTitleId** secondaryTitles);
|
||||
extern "C" bool iplSDChannelSelect_813DB478(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId titleId);
|
||||
extern "C" bool iplSDChannelSelect_813DB58C(ipl::scene::SDChannelSelect* channelSelect,
|
||||
ESTitleId** titles, ESTitleId** secondaryTitles,
|
||||
ESTitleId** names);
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
@@ -922,8 +912,8 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
if (iplSDChannelSelect_813DB530(mpSDChannelSelect, &mTitleListState.mpNames,
|
||||
&mTitleListState.mpSecondaryTitles)) {
|
||||
if (mpSDChannelSelect->enqueueErrorNotice(&mTitleListState.mpNames,
|
||||
&mTitleListState.mpSecondaryTitles)) {
|
||||
mDialogState = 19;
|
||||
mCurrentTitleName[0] = L'\0';
|
||||
mCurrentTitle = 0;
|
||||
@@ -996,7 +986,7 @@ namespace ipl {
|
||||
if (iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
|
||||
iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
|
||||
ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDChannelSelect_813DB478(mpSDChannelSelect, titleId)) {
|
||||
if (mpSDChannelSelect->enqueueMoveNotice(titleId)) {
|
||||
mDialogState = 14;
|
||||
} else {
|
||||
System::getDialog()->terminate();
|
||||
@@ -1046,7 +1036,7 @@ namespace ipl {
|
||||
|
||||
void SDMemory::onDialogState16() {
|
||||
if (mTitleCount > mCurrentTitle && System::isReceiveScheduleStopped()) {
|
||||
if (iplSDChannelSelect_813DB4D4(mpSDChannelSelect, mTitleIds[mCurrentTitle], 0)) {
|
||||
if (mpSDChannelSelect->enqueueStateNotice(mTitleIds[mCurrentTitle], 0)) {
|
||||
mDialogState = 16;
|
||||
} else {
|
||||
System::getDialog()->terminate();
|
||||
@@ -1101,7 +1091,7 @@ namespace ipl {
|
||||
System::getDialog()->setTitleForSDMemory(mCurrentTitleName);
|
||||
|
||||
const ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDChannelSelect_813DB5EC(mpSDChannelSelect, titleId)) {
|
||||
if (mpSDChannelSelect->enqueueDeleteNotice(titleId)) {
|
||||
mDialogState = 18;
|
||||
} else {
|
||||
System::getDialog()->terminate();
|
||||
@@ -1679,10 +1669,9 @@ namespace ipl {
|
||||
mTitleListState.mSecondaryCount = 0;
|
||||
mTitleListState.mpNames = mSDTitleIds;
|
||||
mTitleListState.mNameCount = 0;
|
||||
iplSDChannelSelect_813DB58C(mpSDChannelSelect,
|
||||
&mTitleListState.mpTitles,
|
||||
&mTitleListState.mpSecondaryTitles,
|
||||
&mTitleListState.mpNames);
|
||||
mpSDChannelSelect->enqueueCommandNotice(&mTitleListState.mpTitles,
|
||||
&mTitleListState.mpSecondaryTitles,
|
||||
&mTitleListState.mpNames);
|
||||
}
|
||||
|
||||
if (paneIndex == 4) {
|
||||
|
||||
@@ -349,7 +349,7 @@ namespace ipl {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueMoveNotice(u32 controller, u32 page, u32 index) {
|
||||
bool SDChannelSelect::enqueueMoveNotice(u64 titleId) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
@@ -358,7 +358,7 @@ namespace ipl {
|
||||
command.type = 6;
|
||||
command.arguments.values[0] = 0;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
command.titleId = titleId;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -377,36 +377,36 @@ namespace ipl {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueErrorNotice(u32 page, u32 index) {
|
||||
bool SDChannelSelect::enqueueErrorNotice(ESTitleId** titleIds, ESTitleId** secondaryTitles) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
|
||||
SDChannelSelectCommand command;
|
||||
command.type = 11;
|
||||
command.arguments.values[0] = page;
|
||||
command.arguments.values[1] = index;
|
||||
command.arguments.values[0] = reinterpret_cast<u32>(titleIds);
|
||||
command.arguments.values[1] = reinterpret_cast<u32>(secondaryTitles);
|
||||
command.titleId = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueCommandNotice(u32 page, u32 index, u32 commandType) {
|
||||
bool SDChannelSelect::enqueueCommandNotice(ESTitleId** titles, ESTitleId** secondaryTitles, ESTitleId** names) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
|
||||
SDChannelSelectCommand command;
|
||||
command.arguments.values[0] = page;
|
||||
command.arguments.values[0] = reinterpret_cast<u32>(titles);
|
||||
command.type = 12;
|
||||
command.arguments.values[1] = index;
|
||||
command.arguments.values[2] = commandType;
|
||||
command.arguments.values[1] = reinterpret_cast<u32>(secondaryTitles);
|
||||
command.arguments.values[2] = reinterpret_cast<u32>(names);
|
||||
command.titleId = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueDeleteNotice(u32 controller, u32 page, u32 index) {
|
||||
bool SDChannelSelect::enqueueDeleteNotice(u64 titleId) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
@@ -416,7 +416,7 @@ namespace ipl {
|
||||
command.arguments.values[0] = 0;
|
||||
command.arguments.values[1] = 0;
|
||||
command.arguments.values[2] = 0;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
command.titleId = titleId;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,11 @@
|
||||
#define IPL_SDMEMORY_DIALOG_STATE_ACCESSOR
|
||||
#define IPL_SDMEMORY_COMPLETION_PCT_ACCESSOR
|
||||
|
||||
#define IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#include "math/iplInterporation.h"
|
||||
#pragma dont_instantiate ipl::math::HermiteIntp<float>
|
||||
#undef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
|
||||
#include "scene/sdChannelTitle/iplSDChannelTitle.h"
|
||||
#include "scene/sdChannelSelect/iplSDChannelSelect.h"
|
||||
#include "system/iplSystem.h"
|
||||
@@ -86,17 +91,17 @@ static inline void setMemoryTitleLists(SDMemory* memory, SDMemory::TitleRange sd
|
||||
memory->setTitleLists(sdRange, nandRange);
|
||||
}
|
||||
|
||||
static const char* sButtonNames[2] = {"B_BtnA", "B_BtnB"};
|
||||
const char* sButtonNames[2] = {"B_BtnA", "B_BtnB"};
|
||||
|
||||
static const int sCaptureSizes[2][2] = {{128, 96}, {176, 96}};
|
||||
extern const int sCaptureSizes[2][2] = {{128, 96}, {176, 96}};
|
||||
|
||||
static const wchar_t sMissingTitle[] = L"???";
|
||||
extern const wchar_t sMissingTitle[] = L"???";
|
||||
|
||||
static const char* sButtonGroups[7] = {
|
||||
const char* sButtonGroups[7] = {
|
||||
"G_FocusBtnA", "G_FocusBtnB", "G_SelectBtnA", "G_SelectBtnB",
|
||||
"G_OnOffBtnA", "G_OnOffBtnB", "G_OutBtn"
|
||||
};
|
||||
static const char* sButtonAnimationNames[6] = {
|
||||
const char* sButtonAnimationNames[6] = {
|
||||
"mn_SdcardMenuBanner_bc_FocusBtnA_off.brlan",
|
||||
"mn_SdcardMenuBanner_bc_FocusBtn_on.brlan",
|
||||
"mn_SdcardMenuBanner_bc_SelectBtn_Ac.brlan",
|
||||
@@ -104,15 +109,15 @@ static const char* sButtonAnimationNames[6] = {
|
||||
"mn_SdcardMenuBanner_bc_OnBtn.brlan",
|
||||
"mn_SdcardMenuBanner_bc_OutBtn.brlan"
|
||||
};
|
||||
static const char* sBannerAnimationNames[3] = {
|
||||
const char* sBannerAnimationNames[3] = {
|
||||
"banner.brlan", "banner_Start.brlan", "banner_Loop.brlan"
|
||||
};
|
||||
static const char* sTexturePaneNames[3][4] = {
|
||||
const char* sTexturePaneNames[3][4] = {
|
||||
{"Fre_a", "Fre_d", "Fre_i", "Fre_l"},
|
||||
{"Fre_e", "Fre_f", "Fre_g", "Fre_h"},
|
||||
{"Fre_b", "Fre_c", "Fre_j", "Fre_k"}
|
||||
};
|
||||
static const char* sTextNames[2] = {"T_BtnA", "T_BtnB"};
|
||||
const char* sTextNames[2] = {"T_BtnA", "T_BtnB"};
|
||||
|
||||
class SDTitlePaneEventHandler : public ::gui::EventHandler {
|
||||
public:
|
||||
|
||||
@@ -15,23 +15,37 @@ Fix (all kept): `iplSDButton.h` decl → `void setEventHandler(::gui::EventHandl
|
||||
|
||||
Mechanism note: renaming a `.text` address in symbols.txt propagates through the splitter into orig's DEF name AND every caller's UND reloc name — the legit rename lever.
|
||||
|
||||
## UNSOLVED: enqueue*Notice leading dead-arg (r4)
|
||||
## DECODE: enqueue*Notice u64/pointer signatures (SOLVED — r4 anomaly was MWCC u64 marshaling)
|
||||
|
||||
`SDChannelSelect::enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value)` and
|
||||
`enqueueStateNotice(u32 controller, u32 state, u32 type, u32)` (4×u32 each; defs build
|
||||
`command.titleId = ((u64)page << 32) | index` — proven 4×u32, not u64).
|
||||
The "dead leading arg" was wrong: MWCC lands a **u64 arg only in ALIGNED register pairs**
|
||||
(r3:r4, r5:r6, r7:r8). For a member fn (this=r3) a u64 first param goes to r5:r6 and **r4 is
|
||||
never materialized** — no dead param at all.
|
||||
|
||||
orig call sites marshal r5/r6/r7 but **never write r4** (arg1 `controller` — dead param the
|
||||
def bodies ignore; iplSDMemory callers DO materialize it). Same dead-arg family as
|
||||
setEventHandler but on a LEADING arg — no decl form reproduces it:
|
||||
- arg-count reduction shifts the marshal left (breaks r5/r6/r7 positions)
|
||||
- defaulted params must be trailing
|
||||
- `(u32,u64,u32)` still needs `li r4,0` for arg1
|
||||
- `scene->mPage`/`mIndex`/`channel` as arg1 all emit real loads (`lwz`/`mr`) — orig has none
|
||||
- r4 is call-clobbered at both sites (`bl findChannelObject`, `bl isReceiveScheduleStopped`)
|
||||
so no "value already in r4" source expr exists
|
||||
Verified signatures from orig def bodies (which arg regs get stored into the command struct):
|
||||
- `enqueueChannelNotice(u64 titleId, u32 value)` — def stores r5:r6→titleId, r7→values[0]
|
||||
- `enqueueMoveNotice(u64 titleId)` — def stores r5:r6 only
|
||||
- `enqueueStateNotice(u64 titleId, u32 state)` — r5:r6 + r7
|
||||
- `enqueueDeleteNotice(u64 titleId)` — r5:r6 only
|
||||
- `enqueueErrorNotice(ESTitleId** titleIds, ESTitleId** secondaryTitles)` — stores r4,r5
|
||||
- `enqueueCommandNotice(ESTitleId**,ESTitleId**,ESTitleId**)` — stores r4,r5,r6
|
||||
- `enqueueNotice(u32,u32,u32)` — stores r4,r5,r6 — unchanged, verified correct
|
||||
- `enqueueResultNotice(u32)` — stores r4 — unchanged
|
||||
|
||||
Residual = `+li r4,0` plus marshal-order (orig emits r6-before-r5 / addi-first) — scheduler family.
|
||||
Orig callers confirm: iplSDMemory's onDialogState14/16/18 load `lwz r5,0x80(r4); lwz r6,0x84(r4)`
|
||||
(a u64 member `mTitleIds[i]`) directly into r5:r6 — never touching r4.
|
||||
|
||||
Fix (all kept): header decls + defs + symbols.txt mangles (`FUxUl`/`FUx`/`FPPUxPPUx`/`FPPUxPPUxPPUx`);
|
||||
sdChannelTitle call sites pass `scene->mTitleId`/`temporaryTitle` directly (dropped the
|
||||
`((u64)page<<32)|index` synthesize). All defs + all callers now instruction-identical.
|
||||
|
||||
Access cleanup: orig callers called these as private members — extended the header's existing
|
||||
`#if defined(...CPP) public:` gate with `IPL_SD_CHANNEL_MEMORY_CPP` (defined at the top of
|
||||
iplSDMemory.cpp), letting the 5 banned `extern "C" iplSDChannelSelect_813DXXXX` stubs in
|
||||
iplSDMemory.cpp be deleted and replaced with real member calls (insn-identical, UND names
|
||||
now match orig's re-split relocs).
|
||||
|
||||
Result: sdChannelTitle fuzzy 99.98883 (+648B matched code; both enqueue call sites 100%),
|
||||
sdChannelSelect defs all instruction-identical, sdChannelMemory callers insn-identical.
|
||||
|
||||
## TIE: flushSaveBeforeExit eval-order (98.59)
|
||||
|
||||
@@ -40,7 +54,10 @@ Insn+reloc-identical except a 6-word window: orig `lis r3` (smArg base→r3), `l
|
||||
receiver-load before heap-load. Orig evaluated the `flushAsync` ARG before the receiver reload.
|
||||
Tried: `saveHeap` local (before/after stw, decl-init, separate assign — emits at-birth or at-use,
|
||||
never between), `saveData`/`mgr` local (caches receiver → 5-insn form, wrong), nested
|
||||
`flushAsync(System::getMem2App())` (same as original). All ~6-word identical or regression.
|
||||
`flushAsync(System::getMem2App())` (same as original), explicit `manager` receiver temp born
|
||||
between `saveHeap` and the call (identical — remat'd at use). All ~6-word identical or regression.
|
||||
Precise residual: mine emits `recv lwz r3,0x94` before `arg lwz r4,0x28`; orig swaps them —
|
||||
receiver-first vs arg-first marshal order, scheduler tie-break on two independent remat loads.
|
||||
|
||||
## TIE: ConstructOpAnalyzeGLGR 20-diff window (91.79)
|
||||
|
||||
@@ -49,9 +66,150 @@ mid-flag-chain (issued at birth, deep-callee homes); mine emits both at-use (`lh
|
||||
~8 insns later). Same callee-web rotation family. Kept: flags-first reorder (24→20 diffs) +
|
||||
the second `pGlgr = &font->glgr` assignment (removing it = 113 diffs). Decl-init variant no-op.
|
||||
|
||||
Round-2 decode of the window: both sides interleave the same inlined helper tree
|
||||
(CalcSizeFlagSet + CalcOffsetSheetFlags + ROUNDUP chains + the 0x1c/0xe ctx loads) — only the
|
||||
issue ORDER inside the ready-set differs. Orig issues `lhz r26,0x1c`/`lhz r25,0xe` ~10 insns
|
||||
later in the chain than mine. Tried: stepSheetFlags-after-flagsSheetsOff reorder (97.94,
|
||||
regression) and inlining both into use sites (96.99, regression) — committed form stands.
|
||||
|
||||
## ARTIFACT: .sbss2 8B vs 1B (ut_ArchiveFontBase) — splitter extent attribution
|
||||
|
||||
orig's `.sbss2` = 8B: `LOAD_GLYPH_ALL` (1B) + 7 anonymous tail bytes. Not a missing object —
|
||||
symbols.txt shows `DefaultBlackColor` at 0x81696010 (8-aligned): the 7B is the DOL's alignment
|
||||
padding absorbed into this TU's reconstructed extent. Same pattern (sbss2=8) across many orig
|
||||
.o files (zi8getc2, sha1, lyt_material, ...). No legitimate source lever — adding a second
|
||||
unnamed/anonymous object is banned; no static-local evidence in ghidra decomp.
|
||||
|
||||
## ARTIFACT: .sdata2 weak-emission literals (iplSDChannelTitle)
|
||||
|
||||
Mine emits `2.0f`/`3.0f` inside weak `HermiteIntp<f32>::get` (TU runs
|
||||
`new math::HermiteIntp<f32>()` at line 227); orig's .o shows all-UND for the weak emission —
|
||||
splitter weak-dedup artifact. .sdata2 byte-content + fuzzy already 100; only the @literal
|
||||
OBJECT granularity differs (orig merges, mine carves) — no source lever found that suppresses
|
||||
the weak emission without changing semantics.
|
||||
|
||||
## Status
|
||||
|
||||
- iplSDChannelTitle: .text 99.9, all data sections 100% (baseline was data 12.1%). Three
|
||||
sub-100 fns — all at the anomalies/ties above.
|
||||
- ut_ArchiveFontBase: .text 98.5 — the 20-diff window.
|
||||
- iplSDChannelTitle: fuzzy 99.98883, code 18476/18624, data 1976/1976 (all data 100%).
|
||||
Only flushSaveBeforeExit 98.59 — the eval-order tie above. Remaining granularity = weak-emission
|
||||
literal artifact.
|
||||
- ut_ArchiveFontBase: fuzzy 98.468, code 4164/5120, data 96/96. Only ConstructOpAnalyzeGLGR 91.79
|
||||
(20-diff scheduler window) + .sbss2 extent artifact.
|
||||
- DOL sha1 `26116613f624061ba99c8d1a299aaa6efa85670d` verified. No shims; both units stay NonMatching.
|
||||
|
||||
## DECODE (round 3): HermiteIntp<f32> weak-UND parity — RESOLVED
|
||||
|
||||
Orig's .o UND-references all three `HermiteIntp<f32>` weak fns (__ct__/__dt__/init via
|
||||
iplUtility.o GLOBAL ownership; `get` via iplChannelTitle.o GLOBAL at 0x813B5C60). Reproduced
|
||||
by: `IPL_CHANNEL_TITLE_NOVTABLE` gate scoped around `#include "math/iplInterporation.h"` +
|
||||
`#pragma dont_instantiate ipl::math::HermiteIntp<float>` + `#undef` (narrow scope — wider
|
||||
scope UNDs the gui vtables that orig's TU DID emit, shrinking .data to 0x5c8 vs orig 0x6a0),
|
||||
plus the out-of-line `HermiteIntp<f32>::get` def added to iplChannelTitle.cpp between
|
||||
draw/destroy (orig's own emission site — iplChannelTitle now fully 100%). UND set now matches
|
||||
orig for the whole HermiteIntp family; .sdata2 bytes identical (36B both).
|
||||
|
||||
## DECODE (round 3): DynamicCast gate
|
||||
|
||||
`IPL_SD_CHANNEL_TITLE_CPP` added to the `RuntimeTypeInfo.h` declared-only gate (with
|
||||
IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST / IPL_MEMORYCARD_BASE_CPP) — orig UNDs
|
||||
`DynamicCast<Pane*,TextBox>`; previously emitted weak + pulled `typeInfo` UND extras.
|
||||
|
||||
## DECODE (round 3): named-array binding
|
||||
|
||||
8 file-scope arrays changed `static const` → `extern const`/`const` (sButtonNames,
|
||||
sCaptureSizes, sMissingTitle, sButtonGroups, sButtonAnimationNames, sBannerAnimationNames,
|
||||
sTexturePaneNames, sTextNames) — `const` alone leaves namespace-scope arrays internal in C++;
|
||||
`extern const` gives STB_GLOBAL matching orig's decls.
|
||||
|
||||
## WALL: .data tail 0x44 = __vt__Q23gui7Manager emission
|
||||
|
||||
orig's reconstructed .data tail (0x5c8-0x6a0) holds 4 gui vtables: ipl::gui::PaneManager
|
||||
(0x5C) + gui::EventHandler (0x18) + gui::Interface (0x20) + gui::Manager (0x44). Mine emits
|
||||
the first three (dedup'd differently) but NOT Manager vt: `new gui::PaneManager(...)` at
|
||||
~L218 resolves to `ipl::gui::PaneManager`; the ctor chain fully inlines → base-class
|
||||
`__vt__Q23gui7Manager` store DCE'd. Orig's TU emitted the ipl ctor standalone (weak) →
|
||||
gui::PaneManager ctor → Manager ctor → Manager vt. `IPL_GCW_PANEMANAGER_CTOR_OUT_OF_LINE`
|
||||
exists (NO_INLINE decl) but declaring-only UNDs the ctor — no TU defines it out-of-line, and
|
||||
orig's own .o shows the ctor as UND too (dedup'd; emission happened on ANOTHER TU). No
|
||||
source-level lever to force "call but emit locally"; section bytes .data now 0x65c vs 0x6a0
|
||||
(all sections still 100% fuzzy).
|
||||
|
||||
## TIE: flushSaveBeforeExit 98.59 — refined to base-reg choice
|
||||
|
||||
Remaining 2-insn diff is actually the &smArg materialization register: orig materializes
|
||||
`lis/addi` smArg into r3 → store-mgr in r4 (scratch) → heap→r4 → recv→r3 (chain). Mine puts
|
||||
smArg in r4/r5 → store-mgr in r3 → recv-first order. The reg choice is MWCC's web-home
|
||||
internal; it shifts with every source-form change (saveMgr-local, nested, saveHeap-early,
|
||||
mixed — 8+ variants total across sessions) but never lands r3. Same allocator-tie family as
|
||||
the leaf's other walls.
|
||||
|
||||
## Status (round 3)
|
||||
|
||||
- iplSDChannelTitle: fuzzy 99.98883, code 18476/18624, data 1976/1976. Only
|
||||
flushSaveBeforeExit 98.59 (base-reg tie) + Manager-vt emission artifact.
|
||||
- ut_ArchiveFontBase: fuzzy 98.468, code 4164/5120, data 96/96. GLGR 91.79 (issue-order tie)
|
||||
+ .sbss2 extent artifact.
|
||||
- DOL sha1 `26116613f624061ba99c8d1a299aaa6efa85670d` verified. No shims; both stay
|
||||
NonMatching.
|
||||
|
||||
## mcard2 rotation (leaf extended: iplMemoryCardManager + iplCardSequence)
|
||||
|
||||
Reverted linkgap-owned files (iplChannelTitle.cpp, iplInterporation.h) per orchestrator —
|
||||
HermiteIntp<f32>::get re-emits weak until the linkgap gate lands on main.
|
||||
|
||||
Landings:
|
||||
- symbols.txt: `lbl_81696CF8` → `sCardSlotName__Q23ipl10memorycard` (.sdata 3B "AB") —
|
||||
pairs orig's anonymous slot-name object.
|
||||
- loadCardFileIcons case-0 arm: `iconFmt[iconCount] = iconFmt[iconCount-1]` (plain array
|
||||
index, semantic match for orig's `[-1]/[0]` copy) — fn 508→507 insns (orig 512),
|
||||
fuzzy 97.199→97.221.
|
||||
|
||||
Walls verified (allocator/scheduler tie family throughout):
|
||||
- isMoveEnable/isCopyEnable (99.83 both): 2x `add` operand-order at `&dirs[slot][file]`
|
||||
sites — MWCC canonicalizes commutative add operands by web internals, not parse order
|
||||
(`file + dirs[slot]`, `dirs[slot] + file`, cast forms all emit identically).
|
||||
- update_file_array (99.72): 4-line global-base reg choice (r3 vs r4 smArg base).
|
||||
- getComment (98.94): ~33-pair callee rotation — comment-ptr CSE web claims r26 vs orig
|
||||
r30; `dst` local reshape regressed (232).
|
||||
- create_banner/_create_icon (90.4/87.6): callee-window rotation (dirState r25 vs r30,
|
||||
icon-product webs shallow vs deep); `icon` local + `icon->` consistency regressed (213).
|
||||
- cardThreadMain (97.94): ~79 rotation + rlwimi in-place vs copy-then-insert shape.
|
||||
- runCardMoveOrCopy (97.80): ~575 regname rotation; real diffs = 3x `extsh` s16-marshal
|
||||
(orig re-extends per marshal site — per-use conversion nodes; mine normalized once),
|
||||
1x `li` hoist position. Addressing decomposition: orig sums var parts then folds const
|
||||
into index (`sThread + (idx + 0x10000 - 0x6fb4)`), mine `(sThread + 0x10000) + idx_parts`
|
||||
— MWCC member-chain association; ptr-local/array-index forms don't regroup.
|
||||
|
||||
## Status (mcard2)
|
||||
|
||||
- iplMemoryCardManager: fuzzy 97.88, code 2572/5396, data 100%. 8 sub-100 fns, all tie-class.
|
||||
- iplCardSequence: fuzzy 97.22, code 4168/9852, data 1496/1496 (100%). 3 sub-100 fns.
|
||||
- DOL sha1 `26116613f624061ba99c8d1a299aaa6efa85670d` verified. No shims; all stay NonMatching.
|
||||
|
||||
## mcard2 round 2 — normalized-diff verification
|
||||
|
||||
Verified every sub-100 fn via stripped-normalized diff (regs/addrs/immediates removed):
|
||||
|
||||
- update_file_array, isMoveEnable, isCopyEnable, getComment: norm-diff 0 —
|
||||
instruction-identical modulo register names. Pure allocator homes.
|
||||
- getBlocks (92.0), isBannerEnable (92.3): identical insns except ONE `addi r11,r1,0x20`
|
||||
(_restgpr_29 frame base) hoisted into the index chain in orig vs emitted right
|
||||
before the call in mine. Scheduler placement, no source lever.
|
||||
- _create_icon (87.55): rotation + `(base + fieldconst) + var` vs `(base + var) +
|
||||
fieldconst` addressing regroup on mFileCell chains — same wall as loadCardFileIcons.
|
||||
`MCFileCell* cell = mFileCell[slot]` row-ptr variant regressed (MWCC split
|
||||
0xfe8+0x124), reverted.
|
||||
- create_banner (90.43): same regroup — orig CSEs `mFileCell[slot] + 0x110c`
|
||||
(row+field) then adds file*0x15c per use; mine CSEs full element addr. `cell`
|
||||
row-ptr local regressed.
|
||||
- runCardMoveOrCopy (97.80): 8 norm-diffs = 3x `extsh r4,r30` vs `mr r4,r25` on the
|
||||
s16 `destinationFileNo` PHI web (identical def set both sides: li -1, extsh x2,
|
||||
li -0x80 — MWCC extension-proof boundary differs) + 1 `li` hoist position.
|
||||
- cardThreadMain (97.94): 2 norm-diffs = `mr r4,r19; rlwimi` vs `rlwimi in-place` —
|
||||
orig CSEs `slot<<16` message-base across inlined sendCardSlotState sites (copy then
|
||||
insert), mine rematerializes per site (in-place legal since web dead-after).
|
||||
- loadCardFileIcons (90.45): ~45 norm-diffs. Orig splits member-access as
|
||||
`elem_base + (i*scale + fieldconst)` with indexed lwzx/stwx (iconOffset[iconCount+1]
|
||||
= addi+slwi+stwx); mine folds index into base + offset loads. Tried named index
|
||||
local (lwzux, +0 diffs), u32* array-ptr local (regressed 438) — MWCC
|
||||
addressing-canonicalization picks its own regroup.
|
||||
|
||||
Reference in New Issue
Block a user