mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-09-26 13:33:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(carve): §323 blocker 2 cleared — jr-isolate ov_SC07_000 for func_8017F8B8, byte-identical

Browse Source 
The type-name scan matched `}\s*(\w+)\s*;`, which reads `__attribute__` as the name
and fails on the following `((` — so a packed file-local typedef never entered the
carried set, every decl naming it read as an unknown type, and the isolate refused the
whole overlay. Stripping attributes before the scan is the entire fix.
This commit is contained in:
Drew T
2026-09-02 01:24:53 -06:00
parent ad0d883810
commit 93bfa45561
4 changed files with 4883 additions and 2051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/splat.ov_SC07_000.yaml
+1
View File
@@ -121,6 +121,7 @@ segments:
- [0x52354, c, ov_SC07_000_jr_8017A4AC]
- [0x52cd4, c, ov_SC07_000_jr_8017AE2C]
- [0x53d64, c, ov_SC07_000_jr_8017BEBC]
- [0x57760, c, ov_SC07_000_jr_8017F8B8]
- [0x5a4d8, data, tail]
- [0xa5418, .rodata, ov_SC07_000] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
- [0xa54f4, .rodata, ov_SC07_000_jr_8012ACE0] # Phase-26 §8 jtbl-rodata carve (jtbl_carve.py)
src/ov_SC07_000/ov_SC07_000_jr_8017BEBC.c
-2051
View File
File diff suppressed because it is too large Load Diff
src/ov_SC07_000/ov_SC07_000_jr_8017F8B8.c
+4866
View File
File diff suppressed because it is too large Load Diff
tools/jr_isolate_all.py
+16
View File
@@ -530,6 +530,20 @@ def _engine_types():
return _ENGINE_TYPES
# `} __attribute__((packed, aligned(1))) Blk4_9B4;` — the ATTRIBUTE SITS BETWEEN THE BRACE AND THE
# NAME (P31 S71, §323 blocker 2). Every type-name scan here matched `\}\s*(\w+)\s*;`, which reads
# `__attribute__` as the name, fails on the following `((`, and yields NOTHING — so a packed
# file-local typedef never entered `carried`, every decl naming it read as "unknown type", and
# jr_isolate_all REFUSED the whole overlay. That is the entire §323 carve blocker 2, on
# ov_SC07_000 (`Blk4_9B4`, `Blk4`) and ov_SC03_029 (`Block8_80181600`). Strip attributes first.
_ATTR = re.compile(r'__attribute__\s*\(\((?:[^()]|\([^()]*\))*\)\)')
def _strip_attrs(block):
return _ATTR.sub(' ', block)
def _file_scope_decls(items):
"""[(line, [syms])] for every decl that stood at FILE SCOPE in the original TU, in item
order. TWO sources — the second is the §8b scoping-wall fix:
@@ -559,6 +573,7 @@ def _file_scope_decls(items):
carried = set()
for _, _, _kind, text in items:
for block in oss.file_scope_types(text):
block = _strip_attrs(block)
for a, b in re.findall(r'\}\s*([A-Za-z_]\w*)\s*;|\b(?:struct|union|enum)\s+([A-Za-z_]\w*)', block):
carried.add(a or b)
carried |= set(re.findall(r'typedef\s+[^;{}]*?\(\s*\*\s*([A-Za-z_]\w*)\s*\)\s*\([^;]*\)\s*;', block))
@@ -580,6 +595,7 @@ def _file_scope_decls(items):
seen_types, type_conflicts = {}, []
def _type_names(block):
block = _strip_attrs(block)
names = {a or b for a, b in
re.findall(r'\}\s*([A-Za-z_]\w*)\s*;|\b(?:struct|union|enum)\s+([A-Za-z_]\w*)', block)}
names |= set(re.findall(r'typedef\s+[^;{}]*?\(\s*\*\s*([A-Za-z_]\w*)\s*\)\s*\([^;]*\)\s*;', block))