decomp(inputform): anonymous .sdata2 literal symbols (tiInputForm data 100%) (worker 73353bfe) (#1333)
This commit was merged in pull request #1333.
This commit is contained in:
@@ -20933,31 +20933,28 @@ lbl_81694D18 = .sdata2:0x81694D18; // type:object size:0x4 data:4byte
|
||||
lbl_81694D1C = .sdata2:0x81694D1C; // type:object size:0x4 data:4byte
|
||||
lbl_81694D20 = .sdata2:0x81694D20; // type:object size:0x1 data:byte
|
||||
lbl_81694D24 = .sdata2:0x81694D24; // type:object size:0x1 data:byte
|
||||
scInputFormZeroF = .sdata2:0x81694D28; // type:object size:0x4 align:4 data:float
|
||||
scInputForm640F = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float
|
||||
scInputFormF32ConvertMagic = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double
|
||||
scInputFormOneF = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float
|
||||
scInputFormHalfF = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float
|
||||
scInputFormDegToFIdxF = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
|
||||
scInputForm150F = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float
|
||||
scInputForm30F = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float
|
||||
scInputForm50F = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float
|
||||
scInputForm10F = .sdata2:0x81694D50; // type:object size:0x4 align:4 data:float
|
||||
scInputForm52F = .sdata2:0x81694D54; // type:object size:0x4 align:4 data:float
|
||||
scInputFormTwoF = .sdata2:0x81694D58; // type:object size:0x4 align:4 data:float
|
||||
scInputForm140F = .sdata2:0x81694D5C; // type:object size:0x4 align:4 data:float
|
||||
scInputForm90F = .sdata2:0x81694D60; // type:object size:0x4 align:4 data:float
|
||||
scInputForm253F = .sdata2:0x81694D64; // type:object size:0x4 align:4 data:float
|
||||
scInputForm20F = .sdata2:0x81694D68; // type:object size:0x4 align:4 data:float
|
||||
scInputFormColorRU8 = .sdata2:0x81694D6C; // type:object size:0x1 data:byte
|
||||
scInputFormColorGU8 = .sdata2:0x81694D6D; // type:object size:0x1 data:byte
|
||||
scInputFormColorBU8 = .sdata2:0x81694D6E; // type:object size:0x1 data:byte
|
||||
scInputFormColorAU8 = .sdata2:0x81694D6F; // type:object size:0x1 data:byte
|
||||
scInputForm255F = .sdata2:0x81694D70; // type:object size:0x4 align:4 data:float
|
||||
scInputForm127F = .sdata2:0x81694D74; // type:object size:0x4 align:4 data:float
|
||||
scInputForm14592F = .sdata2:0x81694D78; // type:object size:0x4 align:4 data:float
|
||||
scInputFormF64ConvertMagic = .sdata2:0x81694D80; // type:object size:0x8 align:8 data:double
|
||||
scInputForm15F = .sdata2:0x81694D88; // type:object size:0x4 align:4 data:float
|
||||
@13326 = .sdata2:0x81694D28; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13327 = .sdata2:0x81694D2C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13360 = .sdata2:0x81694D30; // type:object size:0x8 scope:local align:8 data:double
|
||||
@13767 = .sdata2:0x81694D38; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13772 = .sdata2:0x81694D3C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13804 = .sdata2:0x81694D40; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13805 = .sdata2:0x81694D44; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13806 = .sdata2:0x81694D48; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13807 = .sdata2:0x81694D4C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13808 = .sdata2:0x81694D50; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13809 = .sdata2:0x81694D54; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13810 = .sdata2:0x81694D58; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13811 = .sdata2:0x81694D5C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13812 = .sdata2:0x81694D60; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13813 = .sdata2:0x81694D64; // type:object size:0x4 scope:local align:4 data:float
|
||||
@13814 = .sdata2:0x81694D68; // type:object size:0x4 scope:local align:4 data:float
|
||||
@8131 = .sdata2:0x81694D6C; // type:object size:0x4 scope:local data:byte
|
||||
@14016 = .sdata2:0x81694D70; // type:object size:0x4 scope:local align:4 data:float
|
||||
@14017 = .sdata2:0x81694D74; // type:object size:0x4 scope:local align:4 data:float
|
||||
@14018 = .sdata2:0x81694D78; // type:object size:0x4 scope:local align:4 data:float
|
||||
@14021 = .sdata2:0x81694D80; // type:object size:0x8 scope:local align:8 data:double
|
||||
@14117 = .sdata2:0x81694D88; // type:object size:0x4 scope:local align:4 data:float
|
||||
lbl_81694D90 = .sdata2:0x81694D90; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D94 = .sdata2:0x81694D94; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D98 = .sdata2:0x81694D98; // type:object size:0x4 align:4 data:float
|
||||
|
||||
37
tools/decomp-assist/o-ifl2.attempts.md
Normal file
37
tools/decomp-assist/o-ifl2.attempts.md
Normal file
@@ -0,0 +1,37 @@
|
||||
# o-ifl2 attempts: tiInputForm `.sdata2` data match
|
||||
|
||||
Worktree data-d4, branch agent/w1009/o-ifl2, base da267147 (tiInputForm linked, #1332).
|
||||
Start: `.sdata2` 96.15%, unit data 3668/3772, global matched data 99.99432%.
|
||||
|
||||
## What the stripped constant is
|
||||
|
||||
- The original TU compiled `nw4r::lyt::TextBox::GetTextColor` (inline, `NW4R_ASSERT` -> OSFatal):
|
||||
`LayoutByNW4R::create` calls it out of line (target reloc at .text 0x9ef0), and its weak
|
||||
`@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl` (the Error#004 message, 0x41) sits in this unit's
|
||||
`.data` at 0x8165D28C. The linker kept RsoSystem's copy (0x8135A4C0, earlier in link order) and
|
||||
dropped this one along with its `{255,255,255,0}` front-color literal in `.sdata2`.
|
||||
- So the weak instantiation is correct. Removing it would drop 0x41 bytes from `.data`.
|
||||
- dtk 1.7.5 `stripped` cannot describe it: the flag exists for common-BSS matching, and stripped
|
||||
symbols "don't actually exist at the address" and are filtered out of splits. The split `.sdata2`
|
||||
is the 104 DOL bytes; nothing can add the 4 stripped bytes.
|
||||
|
||||
## Why objdiff scored 96%
|
||||
|
||||
objdiff 3.4.5 `diff_data_section` takes the better of a byte diff of the section (100 vs 108 bytes
|
||||
here: the extra literal plus 4 bytes of double alignment -> 200/208 = 96.15%) and symbol pairing.
|
||||
Compiler literals (`@N`) pair by value. The target's `.sdata2` symbols were the invented
|
||||
`scInputForm*` names from #626 (they matched dummy named constants that #1332 removed), so nothing
|
||||
paired and the byte diff decided. RsoSystem's object also carries an extra literal (`@17197`, 0.0f,
|
||||
ahead of `scRsoZeroF`) and scores 100% the same way: its target symbol pairs.
|
||||
|
||||
## Fix
|
||||
|
||||
`config/43U/symbols.txt` 0x81694D28-0x81694D90: the 25 `scInputForm*` entries become the 22
|
||||
anonymous literals the source emits (`@N`, `scope:local`, project convention for 655 `.sdata2`
|
||||
entries). The four one-byte `scInputFormColor*U8` entries are one 4-byte object: `drawCursor`'s
|
||||
`GXColor color = {255, 50, 50, 0}` initializer (4 lbz at +0..+3). Numbers are from the current
|
||||
compile. objdiff ignores them for pairing.
|
||||
|
||||
Result: `.sdata2` 100%, unit data 3772/3772, 221/221 exact, DOL SHA1
|
||||
26116613f624061ba99c8d1a299aaa6efa85670d, gate PASS with 0 regressions, global matched data 100%.
|
||||
No source change.
|
||||
Reference in New Issue
Block a user