Compare commits

...

1 Commits

10 changed files with 440 additions and 12 deletions

View File

@@ -908,7 +908,7 @@ config.libs = [
),
# it decides to do fast optimization for this one
IPLSection("keyboard", [
Object(NonMatching, "keyboard/tiPcKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiPcKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiCellPhone.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiInputForm.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiCandidateBox.cpp", extra_cflags=["-O4,p"]),

View File

@@ -74,8 +74,16 @@ namespace textinput {
virtual void onEvent(GUIComponent& comp, u32 event, void* data) {} // 0x0C
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void setLatestEventCtrlNo(int ctrlNo);
#else
virtual void setLatestEventCtrlNo(int ctrlNo) { muLatestEventCtrlNo = ctrlNo; } // 0x10
#endif
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual int getLatestEventCtrlNo();
#else
virtual int getLatestEventCtrlNo() { return muLatestEventCtrlNo; } // 0x14
#endif
protected:
int muLatestEventCtrlNo; // 0x04
@@ -109,7 +117,11 @@ namespace textinput {
: GUIInterface(), mbInitialize(false), mDraggingButton(0xFFFF), mID(id), mbTriggerTarget(false), mpManager(NULL), mpListener(NULL) {
init();
}
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual ~GUIComponent();
#else
virtual ~GUIComponent() {} // 0x08
#endif
virtual u32 getID() { return mID; } // 0x20
@@ -146,7 +158,11 @@ namespace textinput {
}
virtual bool isTriggerTarget() { return mbTriggerTarget; } // 0x48
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void setTriggerTarget(bool bEnable);
#else
virtual void setTriggerTarget(bool bEnable) { mbTriggerTarget = bEnable; } // 0x4C
#endif
void setParentManager(GUIManager* manager) { mpManager = manager; }
GUIManager* getParentManager() { return mpManager; }

View File

@@ -47,7 +47,11 @@ namespace textinput {
#else
virtual Language getLanguage() const { return meLanguage; }
#endif
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void update();
#else
virtual void update() {}
#endif
#else
virtual Language getLanguage() const;
virtual void update();

View File

@@ -64,7 +64,11 @@ namespace textinput {
virtual void setWCString(const wchar_t* string);
virtual void setLanguage(Language language);
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual Language getLanguage() const;
#else
virtual Language getLanguage() const { return meLanguage; }
#endif
#ifdef MYTIMANAGER_IMPLEMENTATION
Language getLanguageForMemo() const { return meLanguage; }
#endif
@@ -129,10 +133,18 @@ namespace textinput {
virtual const InputForm* getInputForm() const { return mpInputForm; }
virtual keyboard::hwkey::HWKeyboard* getHWKeyboard() { return mpHWKeyboard; }
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const;
#else
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const { return mpHWKeyboard; }
#endif
virtual keyboard::pctype::LayoutByNW4R* getPCKeyboard() { return mpPCKeyboard; }
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const;
#else
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const { return mpPCKeyboard; }
#endif
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
@@ -149,7 +161,11 @@ namespace textinput {
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual const toolbar::LayoutByNW4R* getToolBar() const;
#else
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
#endif
#ifdef TIMANAGER_IMPLEMENTATION
virtual void* getPredictLanguageSelectDialog();

View File

@@ -36,7 +36,11 @@ namespace textinput {
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, Input* input) = 0; // 0x18
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void setEventObserver(EventObserver *event);
#else
virtual void setEventObserver(EventObserver *event) { mpEventObserver = event; } // 0x1C
#endif
protected:
EventObserver* mpEventObserver; // 0x08
@@ -97,25 +101,19 @@ namespace textinput {
virtual void calc(); // 0x0C
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void onAnmEvent(AnmPaneEvent) {}
virtual void onAnmEvent(AnmPaneEvent);
#else
virtual void onAnmEvent(AnmPaneEvent paneEvent);
#endif // 0x10
virtual void changeAnimation(u32 id); // 0x14
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual bool isInAnimation() { return mpCurrentAnim != NULL; }
virtual bool isInAnimation();
#else
virtual bool isInAnimation();
#endif // 0x18
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual Anim* searchAnimation(u32 id) {
for (Anim* animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, NULL)); animation != NULL;
animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, animation))) {
if (animation->muID == id) return animation;
}
return NULL;
}
virtual Anim* searchAnimation(u32 id);
#else
virtual Anim* searchAnimation(u32 id);
#endif // 0x1C
@@ -247,14 +245,22 @@ namespace textinput {
virtual bool updateInput(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x20
virtual bool updateInput(input::HKBManager& hkbManager); // 0x24
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual TiLayout* getLayout();
#else
virtual TiLayout* getLayout() { return mpLayout; } // 0x28
#endif
virtual nw4r::lyt::Pane* getPane(const char* paneName); // 0x2C
virtual const nw4r::lyt::Pane* getPane(const char* paneName) const; // 0x30
virtual u32 getFlightDuration(int point, const char* paneName); // 0x34
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void setAnimOn(bool flag);
#else
virtual void setAnimOn(bool flag) { mbAnimOn = flag; } // 0x38
#endif
virtual void drawPane(const char* paneName); // 0x3C
@@ -282,8 +288,16 @@ namespace textinput {
virtual AnmPane* searchAnmPane(const char* paneName); // 0x60
virtual AnmPane* searchAnmPane(wchar_t ch); // 0x64
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual nw4r::ut::List& getAnmPaneList();
#else
virtual nw4r::ut::List& getAnmPaneList() { return mAnmPanes; } // 0x68
#endif
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual gui::PaneManager* getPaneManager();
#else
virtual gui::PaneManager* getPaneManager() { return mpPaneManager; } // 0x6C
#endif
virtual void AdjustPaneMtx(Mtx& mtx, const nw4r::lyt::DrawInfo& drawInfo, const nw4r::math::MTX34& mGlobalMtx); // 0x70

View File

@@ -191,7 +191,11 @@ namespace textinput {
#endif
virtual ~Base();
virtual void create(MEMAllocator* allocator);
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void init();
#else
virtual inline void init();
#endif
virtual void updateFromReceiver(u32 command, void* data);
virtual void onKey(u32 event, void* data);
virtual int getType();
@@ -223,6 +227,9 @@ namespace textinput {
virtual void updateFixMode();
protected:
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
inline void initializeKeyState();
#endif
State mState;
const LanguageData* mpInitialLanguageData;
KeyState mKeyState;
@@ -301,6 +308,8 @@ namespace textinput {
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mpKeyboardEventHandler(NULL),
mShiftButton(1, this, this), mCapsButton(0, this, this), mModePanel(2, this, this) {}
#elif defined(TI_PC_KEYBOARD_IMPLEMENTATION)
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName);
#endif
virtual ~LayoutByNW4R();
virtual void create(MEMAllocator* allocator);
@@ -352,6 +361,15 @@ namespace textinput {
UIModePanel mModePanel;
};
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
class Sample : public LayoutByNW4R {
public:
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
: LayoutByNW4R(manager, accessor, observer, layoutName) {}
virtual ~Sample() {}
};
#endif
class AnmPane : public nw4rmanager::AnmPane {
public:
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer), mAnimation(0) {}

View File

@@ -14,9 +14,17 @@ namespace textinput {
Base(Manager* manager) : mQwerty(true), meLanguage(USA), mpAllocator(NULL), mpManager(manager) {}
#endif
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual void create(MEMAllocator* allocator);
#else
virtual void create(MEMAllocator* allocator) { mpAllocator = allocator; }
#endif
virtual void init() {}
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
virtual bool isQwerty() const;
#else
virtual bool isQwerty() const { return mQwerty; }
#endif
virtual void setQwerty(bool qwerty);
virtual void setLanguage(Language language) { meLanguage = language; }
virtual Language getLanguage() const { return meLanguage; }

View File

@@ -11,6 +11,18 @@
#include "keyboard/tiLanguageIndependentData.h"
namespace textinput {
const keyboard::hwkey::HWKeyboard* Manager::getHWKeyboard() const {
return mpHWKeyboard;
}
bool toolbar::Base::isQwerty() const {
return mQwerty;
}
const toolbar::LayoutByNW4R* Manager::getToolBar() const {
return mpToolBar;
}
namespace keyboard {
namespace pctype {
struct SelectorPosition {
@@ -1317,6 +1329,20 @@ namespace textinput {
}
}
}
}
const keyboard::pctype::LayoutByNW4R* Manager::getPCKeyboard() const {
return mpPCKeyboard;
}
Language Manager::getLanguage() const {
return meLanguage;
}
namespace keyboard {
namespace pctype {
bool Base::isCapsOn() const {
return (mKeyState.abcFlags >> 6) & 1;
}
@@ -1325,7 +1351,7 @@ namespace textinput {
mpAllocator = allocator;
}
void Base::init() {
inline void Base::initializeKeyState() {
mState.rejected = false;
Language language = getLanguage();
mKeyState.inputType = 0;
@@ -1343,6 +1369,10 @@ namespace textinput {
sendCommand(18, &mode);
}
void Base::init() {
initializeKeyState();
}
void Base::inputCharCode(wchar_t code) {
sendInputWChar(code, false);
}
@@ -1942,8 +1972,18 @@ namespace textinput {
AnmPane::~AnmPane() {
}
}
}
TiLayout* nw4rmanager::Layout::getLayout() {
return mpLayout;
}
namespace keyboard {
namespace pctype {
void LayoutByNW4R::init() {
Base::init();
initializeKeyState();
setLineFeedButton(true);
setPredictLanguageButton(true);
setSignWindowButton(true);
@@ -2291,6 +2331,15 @@ namespace textinput {
}
}
}
}
void nw4rmanager::AnmPane::onAnmEvent(AnmPaneEvent) {
}
namespace keyboard {
namespace pctype {
void LayoutByNW4R::cancelStateFocusIn() {
for (AnmPane* pane = static_cast<AnmPane*>(nw4r::ut::List_GetFirst(&mAnmPanes)); pane != NULL;
pane = static_cast<AnmPane*>(nw4r::ut::List_GetNext(&mAnmPanes, pane))) {
@@ -3075,6 +3124,20 @@ namespace textinput {
: UIObj(id, layout, listener), mpPaneComponent(NULL), mpBoundingComponent(NULL), mpAnimation(NULL), mbOn(false) {
}
}
}
gui::PaneManager* nw4rmanager::Layout::getPaneManager() {
return mpPaneManager;
}
void gui::GUIComponent::setTriggerTarget(bool triggerTarget) {
mbTriggerTarget = triggerTarget;
}
namespace keyboard {
namespace pctype {
void UIModifierButton::onGUIEvent(gui::PaneComponent&, u32 event, nw4rmanager::TiEventHandler::Input* input) {
const char* name = "P_key_CAPS";
if (mId == 1)
@@ -3130,6 +3193,43 @@ namespace textinput {
void UIModePanel::onGUIEvent(gui::PaneComponent&, u32, nw4rmanager::TiEventHandler::Input*) {
}
}
}
void keyboard::KeyboardBase::update() {
}
nw4r::ut::List& nw4rmanager::Layout::getAnmPaneList() {
return mAnmPanes;
}
void nw4rmanager::Layout::setAnimOn(bool flag) {
mbAnimOn = flag;
}
nw4rmanager::Anim* nw4rmanager::AnmPane::searchAnimation(u32 id) {
for (Anim* animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, NULL)); animation != NULL;
animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, animation))) {
if (animation->muID == id) return animation;
}
return NULL;
}
bool nw4rmanager::AnmPane::isInAnimation() {
return mpCurrentAnim != NULL;
}
int gui::EventHandler::getLatestEventCtrlNo() {
return muLatestEventCtrlNo;
}
void gui::EventHandler::setLatestEventCtrlNo(int ctrlNo) {
muLatestEventCtrlNo = ctrlNo;
}
namespace keyboard {
namespace pctype {
Base::InputMode Base::getAIUInputMode() const {
switch (static_cast<int>(mKeyState.aiuFlags & 15)) {
case 0:
@@ -3188,6 +3288,16 @@ namespace textinput {
void UIObj::onGUIEvent(gui::PaneComponent&, u32, nw4rmanager::TiEventHandler::Input*) {
}
}
}
void nw4rmanager::TiEventHandler::setEventObserver(EventObserver* event) {
mpEventObserver = event;
}
namespace keyboard {
namespace pctype {
void Base::setInputModeCK(u32) {
}

View File

@@ -0,0 +1,67 @@
# lnkx link attempts
Assigned tree w0929-fix-board, branch agent/w1003/astra-link-xhigh, HEAD 38cea737. Prior u4, lnkm and lnkh logs read in full. Their destructor spelling, definition order, base ordering, inherited metadata, inline/weak binding, constructor, Sample emission and compiler-version trials will not be repeated. LINK scope overrides common.md matching-only text. Existing lnkm and lnkh logs preserved. Baseline DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d; pools identical, keyboard 204/204 and audio 0/0.
Prior trials already cover explicit vs implicit destructor, in-class inline definition, definition before overriders and key-function placement. Secondary bases already declare their destructors first. Those hypotheses have negative evidence for both units. New tests focus on the lifetime of compiler vtable metadata and real inherited class emission, without retaining fabricated classes, force-active constructs or foreign unit output. Scratch reproducers are diagnostic only.
## X1: unused real inline derived constructors
A scratch two-base reproducer shows that an unused inline derived constructor plus an inline or implicit derived destructor builds the parent vtable metadata even though no derived-class symbol is emitted. Declaration-only, unused inline destructor-only and a constructor with an external destructor do not. This differs from u4 K18, whose forwarding constructor was non-inline and emitted the foreign table/thunk. No scratch class or artificial trigger was added to source.
Keyboard X1 adds the real pctype::Sample class already present in tiKeyboard.cpp, with its actual forwarding inline constructor and empty inline destructor. A declaration exposes LayoutByNW4R's real constructor signature to that unused inline constructor. No foreign Sample code, data or thunk is emitted. All 141 functions and all code/data remain 100%; pool 204/204. The destructor thunk now comes FIRST, followed by the five ordinary thunks in target order.
Audio X1 includes the real ipl::snd::System class and its actual empty inline constructor. No foreign symbol is emitted; order stays calc then destructor. Later probes below identify the calc override as the important difference. Restored before keyboard link validation.
Keyboard X1 Matching link PASSES: build/43U/ok, full DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d, all 141 functions still 100%. Audio restored to baseline for this isolated proof.
## Audio follow-ups
Scratch reproducers distinguish a subclass that inherits calc from one that overrides calc. Only the former moves the parent destructor thunk first. The real System class overrides calc, so importing its constructor cannot reproduce Sample's useful effect. Inline declarations and inline definitions for its real calc do not change that result. These diagnostic classes remain in ignored build scratch only.
A2 defines the real empty SimpleAudioMgr destructor inline with NO_INLINE to keep WithFx calls exact. A3 likewise exposes its real ArcPlayer(&getSoundHeap()) constructor. A4 combines both. All retain 8/8 and 524/524 code, but add foreign weak functions; A4 adds a parent vtable and destructor thunk. None changes the required pair's order. All restored. The first script version had a malformed preprocessor replacement; those compiler failures produced no measurements and were fixed before these recorded results.
A5-A7 move the real parent constructor/destructor definitions into SimpleAudioMgr's class body with NO_INLINE, testing whether parsing them before WithFx's definition changes the metadata timing. Both together, constructor only, and destructor only each retain all eight exact functions but leave calc before destructor and emit extra parent code. All restored.
Both Matching after keyboard fix: SHA1 03a070db1c6ed8bbe21f9470a1c3ef24d02369ad, sizes 3867904/3867904, 9 differing bytes. Offsets: 0x2c6870, 0x2c6871, 0x2c6872, 0x2c6878, 0x2c6879, 0x2c687a, 0x3639f3, 0x363a17, 0x363a8f
Audio still fails the link criterion. Keyboard fixes all its previous 26 differing bytes. Restoring audio Equivalent before the final clean gate.
## Retained result and handoff
Keyboard is now Matching, with all 28,484 code bytes and 18,564 data bytes fully linked. Its 141/141 functions remain instruction-exact. The restored real Sample declarations emit no Sample function, vtable, or thunk in this object. The only retained source/header change is the 11-line TU-guarded declaration addition, plus the configure.py Matching flag. Audio remains Equivalent and 8/8 exact; the LINK task is incomplete for that unit.
Every one of the 149 explicit ctxdiff.py checks has identical instruction counts and diffs 0. The final full non-quick gate independently checks all 149 functions again. Both pools are identical and every owned section scores 100%. Regenerating the live report changes only the keyboard unit's link measures compared with the initial report; all other unit reports are identical. No regression, forbidden addition, or readability warning. The final 43U build, build/43U/ok and DOL checksum all pass. decomp_status.py ran. Global check_decomp_complete.py remains DECOMPLETE_FAIL because the overall project is unfinished.
Scratch programs and detailed raw checks remain under ignored build/lnkx. No other worktree, source unit, baseline, or orchestration tool was edited. No push, PR, merge, rebase, or delegation. Intermediate commentary was emitted, so the requested zero-commentary audit is not met.
Final full gate:
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/keyboard/tiPcKeyboard] pool: IDENTICAL
[src/keyboard/tiPcKeyboard] objdiff: code 28484/28484 data 18564/18564 functions 141/141 fuzzy 100.0000 linked code 28484
[src/keyboard/tiPcKeyboard] instruction-exact functions: 141/141
[src/keyboard/tiPcKeyboard] section .bss size 16 match 100.0
[src/keyboard/tiPcKeyboard] section .ctors size 4 match 100.0
[src/keyboard/tiPcKeyboard] section .data size 12576 match 100.0
[src/keyboard/tiPcKeyboard] section .rodata size 5816 match 100.0
[src/keyboard/tiPcKeyboard] section .sbss size 8 match 100.0
[src/keyboard/tiPcKeyboard] section .sdata size 136 match 100.0
[src/keyboard/tiPcKeyboard] section .sdata2 size 8 match 100.0
[src/keyboard/tiPcKeyboard] section .text size 28484 match 100.0
[src/keyboard/tiPcKeyboard] baseline: code 28484/28484 data 18564 functions 141 fuzzy 100.0000
[libs/EGG/src/core/eggAudioExpMgr] pool: IDENTICAL
[libs/EGG/src/core/eggAudioExpMgr] objdiff: code 524/524 data 120/120 functions 8/8 fuzzy 100.0000 linked code 0
[libs/EGG/src/core/eggAudioExpMgr] instruction-exact functions: 8/8
[libs/EGG/src/core/eggAudioExpMgr] section .data size 120 match 100.0
[libs/EGG/src/core/eggAudioExpMgr] section .text size 524 match 100.0
[libs/EGG/src/core/eggAudioExpMgr] baseline: code 524/524 data 120 functions 8 fuzzy 100.0000
regressions vs baseline: 0
global matched_code_percent: 92.38495 -> 92.38495
global fuzzy_match_percent: 99.73445 -> 99.73445
global complete_code_percent: 74.91312 -> 75.86412
global matched_data_percent: 99.78196 -> 99.78196
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
note: config touched: configure.py (orchestrator reviews every config/symbols change)
GATE PASS
```

View File

@@ -0,0 +1,175 @@
# u4 link investigation
Assigned branch agent/w1003/sol-u4-ultra, baseline 8479c50a. The task-specific LINK instruction overrides the generic matching-only template. No worker delegation, assembly, label pinning or other worktree edits.
Baseline pools identical: tiPcKeyboard 204/204; eggAudioExpMgr 0/0. Baseline DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
Both units already 100% per named function/data. Keyboard text emission 0x6f98 vs retail 0x6f44, plus secondary-vtable thunk order; audio text same size but the destructor/calc thunks swap.
Trial K1: plain Matching flip yields SHA1 31da1cbc0a71398e3d535ec20285efe94da18ffd. dtk first mismatch at 0x814101D8: expected Manager::getHWKeyboard const, found Base::getTranslateMode. Actual getter is at 0x814154A8. Source emission order is a real linker blocker despite all named code/data being exact.
Trial K2: declare the first three retained virtual accessors out of line only in TI_PC_KEYBOARD_IMPLEMENTATION and define them in retail order; remove Base::init inline marker only in this TU so its existing definition remains in source order. No bodies or target instruction sequences changed.
K2 failed: non-inline toolbar accessor anchors an extra strong Base vtable, colliding with tiToolBar.o, and allowing Base::init to inline changes Layout::init. Trial K3 retains inline/weak accessor declarations with NO_INLINE, and marks Base::init NO_INLINE.
K3 failed: accessor inline declarations defer emission, NO_INLINE on Base::init removes the proven target inlining in Layout::init. Reverted K2/K3. Need preserve inline semantics while recovering code-generation order.
Section audit: keyboard .rodata, .data and .sdata2 are byte-identical before relocation. .bss/.sbss/.sdata end differences are ordinary trailing linker alignment, 12/16, 5/8, 133/136. No .extab/.extabindex exist. Four source-only text symbols total 84 bytes and are deduplicated during the actual link, so linked unit length remains 0x6f44. The linker does retain all 141 retail functions, but in different order.
Compiler diagnostic src/keyboard/tiPcKeyboard ipa function: 126/141 exact, first=['setInputModeJP__Q49textinput8keyboard6pctype4BaseFbUlUl', 'setInputModeCK__Q49textinput8keyboard6pctype4BaseFUl', 'onGUIEvent__Q49textinput8keyboard6pctype5UIObjFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input'], thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv']. No flags retained without full proof.
Compiler diagnostic src/keyboard/tiPcKeyboard ipa function noauto: 110/141 exact, first=['setInputModeJP__Q49textinput8keyboard6pctype4BaseFbUlUl', 'setInputModeCK__Q49textinput8keyboard6pctype4BaseFUl', 'onGUIEvent__Q49textinput8keyboard6pctype5UIObjFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input'], thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv']. No flags retained without full proof.
Compiler diagnostic src/keyboard/tiPcKeyboard ipa file nobottomup: 141/141 exact, first=['getTranslateMode__Q49textinput8keyboard6pctype4BaseCFv', 'isCapsOn__Q49textinput8keyboard6pctype4BaseCFv', 'create__Q49textinput8keyboard6pctype4BaseFP12MEMAllocator'], thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv']. No flags retained without full proof.
Compiler diagnostic src/keyboard/tiPcKeyboard ipa file smart: 121/141 exact, first=['List_GetFirst__Q24nw4r2utFPCQ34nw4r2ut4List', 'getTranslateMode__Q49textinput8keyboard6pctype4BaseCFv', 'isCapsOn__Q49textinput8keyboard6pctype4BaseCFv'], thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv']. No flags retained without full proof.
Compiler diagnostic libs/EGG/src/core/eggAudioExpMgr ipa function: 8/8 exact, first=['initialize__Q23EGG20SimpleAudioMgrWithFxFPQ33EGG9IAudioMgr3Arg', 'SaveState__Q34nw4r3snd9SoundHeapFv', '__ct__Q33EGG20SimpleAudioMgrWithFx9ArgWithFxFv'], thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv']. No flags retained without full proof.
Compiler diagnostic libs/EGG/src/core/eggAudioExpMgr ipa function noauto: 8/8 exact, first=['initialize__Q23EGG20SimpleAudioMgrWithFxFPQ33EGG9IAudioMgr3Arg', 'SaveState__Q34nw4r3snd9SoundHeapFv', '__ct__Q33EGG20SimpleAudioMgrWithFx9ArgWithFxFv'], thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv']. No flags retained without full proof.
Compiler diagnostic libs/EGG/src/core/eggAudioExpMgr ipa file nobottomup: 8/8 exact, first=['__ct__Q23EGG20SimpleAudioMgrWithFxFv', '__dt__Q23EGG20SimpleAudioMgrWithFxFv', '__ct__Q33EGG20SimpleAudioMgrWithFx9ArgWithFxFv'], thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv']. No flags retained without full proof.
Compiler diagnostic libs/EGG/src/core/eggAudioExpMgr ipa file smart: 8/8 exact, first=['__ct__Q23EGG20SimpleAudioMgrWithFxFv', '__dt__Q23EGG20SimpleAudioMgrWithFxFv', '__ct__Q33EGG20SimpleAudioMgrWithFx9ArgWithFxFv'], thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv']. No flags retained without full proof.
Trial K4: out-of-line inline definitions after non-inline declarations, preserving inline semantics and checking whether MWCC retains source definition order without strong vtable anchoring.
K4 failed: standard out-of-line inline definitions still defer the accessors to first use. Reverted. Per-function IPA trials drop to 126/141 or 110/141 and reverse the top-level emission list; file IPA/no-bottom-up keeps 141/141 but does not fix order. No flag retained.
Trial K5: ordinary out-of-line weak accessors, using the project DECL_WEAK binding for methods shared across translation units. Check both emission order and whether the weak key method still incorrectly anchors a strong toolbar vtable.
K5 failed: DECL_WEAK itself defers emission just like inline. Reverted.
Trial K6: normal accessor definitions in target order, declare toolbar::Base::create out of line in this TU so its real external method remains the vtable key. Preserve the proven initialization inline boundary with shared initializeKeyState implementation, keeping Base::init and Layout::init target code unchanged.
K6 restored 141/141, first three linked accessors now in exact retail order, and no extra toolbar vtable. Trial K7: move only the remaining out-of-order real accessors and animation methods to their target source positions; preserve shared headers with the existing TI macro.
K7 preserved 141/141 and restored retained function ordering until the static initializer; changing GUIComponent::setTriggerTarget to out of line made it the vtable key and emitted an extra 104-byte strong GUIComponent table with unneeded inline methods. Trial K8: leave the real GUIComponent destructor declared out of line for this TU, making that earlier external method the key and avoiding a second table owner. No constructor or destructor uses of GUIComponent exist in this unit.
K8: all 141 functions instruction-exact, all retained functions at their exact linked addresses except six 8-byte @68@ thunks. DOL diff shrank 24,301 -> 26 bytes, only the reordered thunk branches and corresponding secondary-vtable pointers. Matching trial SHA1 ae275fe21ca289dfacd2ea1c8b1ed78b8779c359. All original code, data and string bytes unchanged; four extra weak functions deduplicate normally. Remaining layout is the same destructor-thunk ordering failure as audio.
Compiler version diagnostic src/keyboard/tiPcKeyboard GC/3.0a3: 140/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic src/keyboard/tiPcKeyboard GC/3.0a3.2: 140/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic src/keyboard/tiPcKeyboard GC/3.0a3.3: 140/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic src/keyboard/tiPcKeyboard GC/3.0a3.4: 140/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic src/keyboard/tiPcKeyboard GC/3.0a5: 140/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic src/keyboard/tiPcKeyboard Wii/1.0RC1: 94/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic src/keyboard/tiPcKeyboard Wii/1.0: 94/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic src/keyboard/tiPcKeyboard Wii/1.0a: 94/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic src/keyboard/tiPcKeyboard Wii/1.1: 94/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic src/keyboard/tiPcKeyboard Wii/1.3: 94/141 exact; thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr GC/3.0a3: 8/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr GC/3.0a3.2: 8/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr GC/3.0a3.3: 8/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr GC/3.0a3.4: 8/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr GC/3.0a5: 8/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr Wii/1.0RC1: 6/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr Wii/1.0: 6/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr Wii/1.0a: 6/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr Wii/1.1: 6/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
Compiler version diagnostic libs/EGG/src/core/eggAudioExpMgr Wii/1.3: 6/8 exact; thunks=['@52@calc__Q23EGG14SimpleAudioMgrFv', '@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv'].
K10 implicit virtual destructor: 141/141 exact, thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv']; no fix retained.
K11 destructor exception specification: 141/141 exact, thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv']; no fix retained.
K12 destructor before void onPressedCaps();: 141/141 exact, thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv']; no fix retained.
K12 destructor before virtual void draw();: 141/141 exact, thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv']; no fix retained.
K12 destructor before virtual void onEvent(UIObj* object: 141/141 exact, thunks=['@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv', '@68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager', '@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv', '@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv']; no fix retained.
K9 failed to compile with only Layout constructor exposed because its real Base constructor was gated out; K13 exposed existing constructors in the same header, compiled without changing the thunk order, then restored. K10 implicit virtual destructor, K11 throw() and K12 three declaration positions preserve 141/141 but leave destructor last. Ten compiler-version tests agree that the destructor remains last; no version changes retained. Prior sol-link2c and sol-link2m transcripts were read from the logs, not their worktrees: 291 and 82 measurements already rejected declaration/base order, using declarations, actual System constructors, parent vtable builds and compiler versions. Avoid those duplicate audio experiments.
A1 include the own header directly: 8/8 exact, thunks=[('@52@calc__Q23EGG14SimpleAudioMgrFv', '0x1fc'), ('@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv', '0x204')], sections=[('.text', '0x20c'), ('.data', '0x78')]; reverted.
A2 standard nested struct without redundant typedef: 8/8 exact, thunks=[('@52@calc__Q23EGG14SimpleAudioMgrFv', '0x1fc'), ('@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv', '0x204')], sections=[('.text', '0x20c'), ('.data', '0x78')]; reverted.
A3 derived destructor exception specification: 8/8 exact, thunks=[('@52@calc__Q23EGG14SimpleAudioMgrFv', '0x1fc'), ('@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv', '0x204')], sections=[('.text', '0x20c'), ('.data', '0x78')]; reverted.
A4 exception code-generation diagnostic: 8/8 exact, thunks=[('@52@calc__Q23EGG14SimpleAudioMgrFv', '0x1fc'), ('@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv', '0x204')], sections=[('.text', '0x20c'), ('extab', '0x4c'), ('extabindex', '0x3c'), ('.data', '0x78')]; reverted.
K8 linked DOL word-level evidence, 26 differing bytes:
```
0x814170e8: target 4bffab44 candidate 4bffde14, @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv
0x814170f0: target 4bffde0c candidate 4bffe03c, @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager
0x814170f8: target 4bffe034 candidate 4bffbef8, @68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv
0x81417100: target 4bffbef0 candidate 4bffc040, @68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv
0x81417108: target 4bffc038 candidate 4bffb364, @68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv
0x81417110: target 4bffb35c candidate 4bffab1c, @68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv
0x8165bcd0: target 814170e4 candidate 8141710c, __vt__Q49textinput8keyboard6pctype12LayoutByNW4R
0x8165bcd8: target 8141710c candidate 81417104, __vt__Q49textinput8keyboard6pctype12LayoutByNW4R
0x8165bce0: target 81417104 candidate 814170fc, __vt__Q49textinput8keyboard6pctype12LayoutByNW4R
0x8165bce4: target 814170fc candidate 814170f4, __vt__Q49textinput8keyboard6pctype12LayoutByNW4R
0x8165bce8: target 814170ec candidate 814170e4, __vt__Q49textinput8keyboard6pctype12LayoutByNW4R
0x8165bcec: target 814170f4 candidate 814170ec, __vt__Q49textinput8keyboard6pctype12LayoutByNW4R
0x816602c4: target 8141710c candidate 81417104, __vt__Q49textinput8keyboard6pctype6Sample
0x816602cc: target 81417104 candidate 814170fc, __vt__Q49textinput8keyboard6pctype6Sample
0x816602d0: target 814170fc candidate 814170f4, __vt__Q49textinput8keyboard6pctype6Sample
0x816602d4: target 814170ec candidate 814170e4, __vt__Q49textinput8keyboard6pctype6Sample
0x816602d8: target 814170f4 candidate 814170ec, __vt__Q49textinput8keyboard6pctype6Sample
```
src/keyboard/tiPcKeyboard adjustor-thunk relocation audit:
```
source @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv -> updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv, type 10, addend 0x0
source @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager -> updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager, type 10, addend 0x0
source @68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv -> calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv, type 10, addend 0x0
source @68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv -> draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv, type 10, addend 0x0
source @68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv -> init__Q49textinput8keyboard6pctype12LayoutByNW4RFv, type 10, addend 0x0
source @68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv -> __dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv, type 10, addend 0x0
source .rela.data+0x2f58 -> @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv, addend 0x0
source .rela.data+0x2f5c -> @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager, addend 0x0
source .rela.data+0x2f54 -> @68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv, addend 0x0
source .rela.data+0x2f50 -> @68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv, addend 0x0
source .rela.data+0x2f48 -> @68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv, addend 0x0
source .rela.data+0x2f40 -> @68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv, addend 0x0
target @68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv -> __dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv, type 10, addend 0x0
target @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv -> updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv, type 10, addend 0x0
target @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager -> updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager, type 10, addend 0x0
target @68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv -> calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv, type 10, addend 0x0
target @68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv -> draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv, type 10, addend 0x0
target @68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv -> init__Q49textinput8keyboard6pctype12LayoutByNW4RFv, type 10, addend 0x0
target .rela.data+0x2f40 -> @68@__dt__Q49textinput8keyboard6pctype12LayoutByNW4RFv, addend 0x0
target .rela.data+0x2f48 -> @68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv, addend 0x0
target .rela.data+0x2f50 -> @68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv, addend 0x0
target .rela.data+0x2f54 -> @68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv, addend 0x0
target .rela.data+0x2f58 -> @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFiffUlUlUlPv, addend 0x0
target .rela.data+0x2f5c -> @68@updateInput__Q49textinput8keyboard6pctype12LayoutByNW4RFRQ39textinput5input10HKBManager, addend 0x0
```
libs/EGG/src/core/eggAudioExpMgr adjustor-thunk relocation audit:
```
source @52@calc__Q23EGG14SimpleAudioMgrFv -> calc__Q23EGG14SimpleAudioMgrFv, type 10, addend 0x0
source @52@__dt__Q23EGG20SimpleAudioMgrWithFxFv -> __dt__Q23EGG20SimpleAudioMgrWithFxFv, type 10, addend 0x0
source .rela.data+0x4c -> @52@calc__Q23EGG14SimpleAudioMgrFv, addend 0x0
source .rela.data+0x28 -> @52@__dt__Q23EGG20SimpleAudioMgrWithFxFv, addend 0x0
target @52@__dt__Q23EGG20SimpleAudioMgrWithFxFv -> __dt__Q23EGG20SimpleAudioMgrWithFxFv, type 10, addend 0x0
target @52@calc__Q23EGG14SimpleAudioMgrFv -> calc__Q23EGG14SimpleAudioMgrFv, type 10, addend 0x0
target .rela.data+0x28 -> @52@__dt__Q23EGG20SimpleAudioMgrWithFxFv, addend 0x0
target .rela.data+0x4c -> @52@calc__Q23EGG14SimpleAudioMgrFv, addend 0x0
```
New evidence from the linked DOL: the real textinput::keyboard::pctype::Sample vtable at 0x8166021C references five affected LayoutByNW4R thunks, and its real destructor at 0x81439358 is 0x58 bytes, with @68@ destructor at 0x814395D0. src/keyboard/tiKeyboard.cpp already defines this exact real derived class, with no new members and an empty destructor. The PC implementation header currently omits it. Trial K14 restores that proven class declaration with its real empty inline destructor only for this TU. This is not the invented audio Sample class rejected earlier; every symbol and inheritance relation is present in retail.
K14 no change: unused inline Sample destructor was not emitted. Trial K15 defines the same proven real Sample destructor out of line with weak linkage, so the existing strong tiKeyboard.cpp definition remains the owner. Every generated Sample function will be checked against the original tiKeyboard object; no invented symbol is allowed.
K15 prefix DECL_WEAK compiles and flips the Layout destructor thunk to first, proving the real Sample definition is the missing trigger. Its real 0x58-byte destructor is weak but its vtable is strong, which would duplicate the existing tiKeyboard table. Correction to K5: the suffix DECL_WEAK spelling failed to compile; the earlier unchanged-order observation read a stale object and is invalid. Trial K16 uses an ordinary explicit inline Sample destructor definition out of class, to build the real parent table while keeping normal C++ weak ODR emission.
K16 unused inline destructor does not emit/build the Sample vtable. Trial K17 restores the existing real Base/Layout inline constructors and defines the proven forwarding Sample constructor. The real Sample destructor stays external to this unit, preserving tiKeyboard as the vtable key owner. This should leave an ordinary weak duplicate Sample vtable and an unused constructor which the linker can discard. No fake class/function, data pad or forced activity is introduced.
K17 keeps the external Sample key, so the compiler uses its external table without constructing the parent, leaving the thunk order unchanged. Trial K18 keeps the real forwarding constructor while making the proven empty Sample destructor inline. The constructor now needs a normally emitted weak Sample vtable, whose parent is the real LayoutByNW4R.
K18 flips the parent thunk order and keeps 141/141, but is rejected: the duplicate real Sample adjustment thunk is selected before tiKeyboard and its weak table adds linked data, so DOL hash changes globally. Its unused forwarding constructor is discarded. Trial K19 tests TU-local novtable on the proven external Sample class, to avoid emitting its foreign table/thunk while constructing the parent metadata. This is diagnostic only unless every native gate passes.
K19 novtable suppresses the Sample table but also loses the parent thunk-order effect. Trial K20 checks a real weak Sample destructor definition with the same novtable gate instead of the unused constructor. Reject unless it has no foreign emitted data or thunks.
K20 again leaves the destructor last. All Sample/constructor/novtable/weak-attribute experiments were rejected and restored. K8 is retained as safe native emission-order progress, with no change to any named instruction or data bytes. The pending compiler issue has at least ten distinct source trials and a real retail class/vtable proof; no function body is untried or below 100%. Audio A1-A3 preserve 8/8 but do not reverse the pair; A4 exceptions-on adds non-retail exception sections, rejected.
The both-Matching clean full gate fails only the linked DOL gate: SHA1 2956de1849b33025558c4b2b3b701a68a0099645. Both units stay 100% in objdiff and instruction-exact, regressions/forbidden/style are zero. The rejected linked build is not accepted.
## Final retained result
Only the readable K8 method-emission repair is retained. Keyboard stays NonMatching; audio stays Equivalent. No Sample/constructor/novtable/weak-attribute experiment, compiler flag or config change remains. No other source-unit output changes. Linking is NOT complete: keyboard now fails on only 26 bytes from the six reordered @68@ thunks and their real Layout/Sample vtable references; audio fails on nine bytes from the @52@ destructor/calc thunk swap, including the shared SimpleAudioMgr vtable reference. The missing original compiler trigger remains unresolved.
The clean full gate passes with both units unlinked. All 149 exact-name ctxdiff invocations have identical instruction counts and diffs 0. Every original function is objdiff 100%; every owned section is 100%; both pools are identical. The regenerated report equals the initial baseline for all 1,027 units. Full build/43U/ok exists and main.dol is byte-identical to retail, SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Forbidden additions, readability warnings and regressions: 0.
The first announcement before reading the task prompt was a silent-mode breach; all subsequent intermediate messages were tools only. No pushes, PRs, merges, rebases, other worktree edits or worker delegations occurred.
Final full gate:
```
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/keyboard/tiPcKeyboard] pool: IDENTICAL
[src/keyboard/tiPcKeyboard] objdiff: code 28484/28484 data 18564/18564 functions 141/141 fuzzy 100.0000 linked code 0
[src/keyboard/tiPcKeyboard] instruction-exact functions: 141/141
[src/keyboard/tiPcKeyboard] section .bss size 16 match 100.0
[src/keyboard/tiPcKeyboard] section .ctors size 4 match 100.0
[src/keyboard/tiPcKeyboard] section .data size 12576 match 100.0
[src/keyboard/tiPcKeyboard] section .rodata size 5816 match 100.0
[src/keyboard/tiPcKeyboard] section .sbss size 8 match 100.0
[src/keyboard/tiPcKeyboard] section .sdata size 136 match 100.0
[src/keyboard/tiPcKeyboard] section .sdata2 size 8 match 100.0
[src/keyboard/tiPcKeyboard] section .text size 28484 match 100.0
[src/keyboard/tiPcKeyboard] baseline: code 28484/28484 data 18564 functions 141 fuzzy 100.0000
[libs/EGG/src/core/eggAudioExpMgr] pool: IDENTICAL
[libs/EGG/src/core/eggAudioExpMgr] objdiff: code 524/524 data 120/120 functions 8/8 fuzzy 100.0000 linked code 0
[libs/EGG/src/core/eggAudioExpMgr] instruction-exact functions: 8/8
[libs/EGG/src/core/eggAudioExpMgr] section .data size 120 match 100.0
[libs/EGG/src/core/eggAudioExpMgr] section .text size 524 match 100.0
[libs/EGG/src/core/eggAudioExpMgr] baseline: code 524/524 data 120 functions 8 fuzzy 100.0000
regressions vs baseline: 0
global matched_code_percent: 92.22483 -> 92.22483
global fuzzy_match_percent: 99.73261 -> 99.73261
global complete_code_percent: 74.91312 -> 74.91312
global matched_data_percent: 99.78196 -> 99.78196
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```