mirror of https://github.com/zeldaret/oot.git
Make sym_info.py return more results (in both vram and vrom)
This commit is contained in:
parent
6e3236b8a0
commit
8d24f01e6f
21
sym_info.py
21
sym_info.py
|
@ -371,25 +371,28 @@ def sym_info_main():
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
infos: list[mapfile_parser.mapfile.FoundSymbolInfo] = []
|
infos: list[mapfile_parser.mapfile.FoundSymbolInfo] = []
|
||||||
possible_files: list[mapfile_parser.mapfile.File] = []
|
all_possible_files: list[mapfile_parser.mapfile.File] = []
|
||||||
try:
|
try:
|
||||||
address = int(sym_name, 0)
|
address = int(sym_name, 0)
|
||||||
if address >= 0x01000000:
|
|
||||||
|
if address >= 0x0100_0000:
|
||||||
info, possible_files = map_file.findSymbolByVram(address)
|
info, possible_files = map_file.findSymbolByVram(address)
|
||||||
if info is not None:
|
if info is not None:
|
||||||
infos = [info]
|
infos += [info]
|
||||||
else:
|
all_possible_files += possible_files
|
||||||
info, possible_files = map_file.findSymbolByVrom(address)
|
|
||||||
if info is not None:
|
info, possible_files = map_file.findSymbolByVrom(address)
|
||||||
infos = [info]
|
if info is not None:
|
||||||
|
infos += [info]
|
||||||
|
all_possible_files += possible_files
|
||||||
except ValueError:
|
except ValueError:
|
||||||
infos = find_symbols_by_name(map_file, sym_name)
|
infos = find_symbols_by_name(map_file, sym_name)
|
||||||
|
|
||||||
if not infos:
|
if not infos:
|
||||||
print(f"'{sym_name}' not found in map file '{map_path}'")
|
print(f"'{sym_name}' not found in map file '{map_path}'")
|
||||||
if len(possible_files) > 0:
|
if all_possible_files:
|
||||||
print("But it may be a local symbol of either of the following files:")
|
print("But it may be a local symbol of either of the following files:")
|
||||||
for f in possible_files:
|
for f in all_possible_files:
|
||||||
print(f" {f.asStr()})")
|
print(f" {f.asStr()})")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue