Extract Piklib 6.1 methods by name from Runner::run
6.1 has no prepareMthHashSet and no id-switch: CMC_*_Runner::run takes the method *name* (CXString) and dispatches via a `CXString(tmp,"name"); equalsIgnoreCase(name)` chain. extract_methods now falls back (only when the hashset pass finds nothing) to scanning run() for that pattern, recovering the names (no numeric ids). 6.1 now yields 186 methods (Animo: show/hide/play/setFPS/...); dispatch stays 0 since the string chain isn't a jump table. 7.1/8.x untouched (they have prepareMthHashSet). Note: 6.1 names are camelCase/lowercase vs 7.1+ UPPERCASE (engine compares case- insensitively), so a cross-version method diff needs case folding to be clean. 38/38 tests (test_versions updated: 6.1 methods present with id=None). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -328,9 +328,59 @@ def extract_methods(program):
|
||||
methods.extend(own)
|
||||
if base is not None:
|
||||
inheritance.append({"runner": runner, "base_runner": base})
|
||||
if not methods:
|
||||
# Piklib 6.1 predates prepareMthHashSet: methods are dispatched by NAME inside
|
||||
# <Runner>::run, so recover the names from there instead (no numeric ids).
|
||||
methods = extract_methods_by_name(program)
|
||||
return methods, inheritance
|
||||
|
||||
|
||||
def _extract_name_methods_from_run(program, run_func, owner, runner):
|
||||
"""Piklib 6.1's `run(CXString name, ...)` is a chain of `CXString(tmp, "name")` then
|
||||
`equalsIgnoreCase(name)`; the literal built right before each compare is a method name."""
|
||||
listing = program.getListing()
|
||||
methods = []
|
||||
recent = []
|
||||
pending = None
|
||||
seen = set()
|
||||
it = listing.getInstructions(resolve_thunk(run_func).getBody(), True)
|
||||
while it.hasNext():
|
||||
instr = it.next()
|
||||
if instr.getMnemonicString() == "CALL":
|
||||
f = call_target(program, instr)
|
||||
nm = f.getName() if f is not None else None
|
||||
if nm == "CXString": # CXString(tmp, <strptr>) builds the literal
|
||||
s = lookback_string(program, recent)
|
||||
if s is not None and _is_method_name(s):
|
||||
pending = s
|
||||
elif nm == "equalsIgnoreCase" and pending is not None:
|
||||
if pending not in seen:
|
||||
seen.add(pending)
|
||||
methods.append({"owner": owner, "runner": runner, "name": pending, "id": None})
|
||||
pending = None
|
||||
recent.append(instr)
|
||||
if len(recent) > LOOKBACK:
|
||||
recent.pop(0)
|
||||
return methods
|
||||
|
||||
|
||||
def extract_methods_by_name(program):
|
||||
"""Name-dispatched method recovery for engines without prepareMthHashSet (Piklib 6.1)."""
|
||||
fm = program.getFunctionManager()
|
||||
methods = []
|
||||
it = fm.getFunctions(True)
|
||||
while it.hasNext():
|
||||
f = it.next()
|
||||
if f.getName() != "run":
|
||||
continue
|
||||
ns = f.getParentNamespace()
|
||||
runner = ns.getName() if ns is not None else "?"
|
||||
if not runner.endswith("_Runner"):
|
||||
continue
|
||||
methods.extend(_extract_name_methods_from_run(program, f, _owner_from_runner(runner), runner))
|
||||
return methods
|
||||
|
||||
|
||||
_VTBL_OFF = re.compile(r"\[\w+ \+ (0x[0-9a-fA-F]+)\]")
|
||||
_MEM_OFF = re.compile(r"\[\w+ \+ (0x[0-9a-fA-F]+)\]")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user