mirror of https://github.com/zeldaret/oot.git
Add `./sym_info.py --build-dir` to print symbols from an arbitrary build/ folder
This commit is contained in:
parent
f7073a7837
commit
6e3236b8a0
55
sym_info.py
55
sym_info.py
|
@ -288,6 +288,13 @@ def sym_info_main():
|
||||||
help="which version should be processed (default: gc-eu-mq-dbg)",
|
help="which version should be processed (default: gc-eu-mq-dbg)",
|
||||||
default="gc-eu-mq-dbg",
|
default="gc-eu-mq-dbg",
|
||||||
)
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--build-dir",
|
||||||
|
dest="build_dir",
|
||||||
|
help="the build folder in which to read the map and elf (default: `build/VERSION/`)",
|
||||||
|
type=Path,
|
||||||
|
default=None,
|
||||||
|
)
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
@ -302,14 +309,44 @@ def sym_info_main():
|
||||||
else:
|
else:
|
||||||
colors = sys.stdout.isatty()
|
colors = sys.stdout.isatty()
|
||||||
|
|
||||||
BUILTMAP = Path("build") / args.oot_version / f"oot-{args.oot_version}.map"
|
build_dir: Path = args.build_dir
|
||||||
BUILTELF = Path("build") / args.oot_version / f"oot-{args.oot_version}.elf"
|
if build_dir is None:
|
||||||
|
build_dir = Path("build") / args.oot_version
|
||||||
|
map_path = build_dir / f"oot-{args.oot_version}.map"
|
||||||
|
elf_path = build_dir / f"oot-{args.oot_version}.elf"
|
||||||
|
else:
|
||||||
|
map_paths = list(build_dir.glob("*.map"))
|
||||||
|
elf_paths = list(build_dir.glob("*.elf"))
|
||||||
|
|
||||||
|
if len(map_paths) > 1:
|
||||||
|
print(f"Found several .map files instead of just one:")
|
||||||
|
print("\n".join(map(str, map_paths)))
|
||||||
|
sys.exit(1)
|
||||||
|
if not map_paths:
|
||||||
|
print("Could not find map file")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
if len(elf_paths) > 1:
|
||||||
|
print(f"Found several .elf files instead of just one:")
|
||||||
|
print("\n".join(map(str, elf_paths)))
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
map_path = map_paths[0]
|
||||||
|
elf_path = elf_paths[0] if elf_paths else None
|
||||||
|
|
||||||
map_path = BUILTMAP
|
|
||||||
elf_path = BUILTELF
|
|
||||||
if args.use_expected:
|
if args.use_expected:
|
||||||
map_path = "expected" / BUILTMAP
|
map_path = (
|
||||||
elf_path = "expected" / BUILTELF
|
Path("expected")
|
||||||
|
/ "build"
|
||||||
|
/ args.oot_version
|
||||||
|
/ f"oot-{args.oot_version}.map"
|
||||||
|
)
|
||||||
|
elf_path = (
|
||||||
|
Path("expected")
|
||||||
|
/ "build"
|
||||||
|
/ args.oot_version
|
||||||
|
/ f"oot-{args.oot_version}.elf"
|
||||||
|
)
|
||||||
|
|
||||||
if not map_path.exists():
|
if not map_path.exists():
|
||||||
print(f"Could not find map_file at '{map_path}'")
|
print(f"Could not find map_file at '{map_path}'")
|
||||||
|
@ -318,12 +355,14 @@ def sym_info_main():
|
||||||
map_file = mapfile_parser.mapfile.MapFile()
|
map_file = mapfile_parser.mapfile.MapFile()
|
||||||
map_file.readMapFile(map_path)
|
map_file.readMapFile(map_path)
|
||||||
|
|
||||||
if elf_path.exists():
|
if elf_path and elf_path.exists():
|
||||||
local_symbols = read_local_symbols_from_mdebug(elf_path)
|
local_symbols = read_local_symbols_from_mdebug(elf_path)
|
||||||
merge_local_symbols(map_file, local_symbols)
|
merge_local_symbols(map_file, local_symbols)
|
||||||
else:
|
else:
|
||||||
print(
|
print(
|
||||||
f"Could not find ELF file at '{elf_path}', local symbols will not be available"
|
"Could not find ELF file"
|
||||||
|
+ (f" at '{elf_path}'" if elf_path else "")
|
||||||
|
+ ", local symbols will not be available"
|
||||||
)
|
)
|
||||||
|
|
||||||
sym_name = args.symname
|
sym_name = args.symname
|
||||||
|
|
Loading…
Reference in New Issue