mirror of
https://github.com/pmret/papermario.git
synced 2024-11-08 12:02:30 +01:00
e9176cb08f
* bss * 3 audios * d5a50 stuff * some icon funcs * get_icon_render_pos * PlayerLandJump * func_80248170 * cleanup * splat update prep * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "81c4b35b89" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "81c4b35b89" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "9b791a654a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "9b791a654a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2cf2a5e5d8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2cf2a5e5d8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix loop in PaperMarioNpcSprites * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2fab217750" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fab217750" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * add sha1 to yaml * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "426b08200d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "426b08200d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * varTable -> union :( + player_api funcs * 6 more * 4 more * 5 mo * 1 mo * 1 mo 2 * 5 mo * player_jump * 3 mo * some 18F340 * 6 more * 6 mo * nm * 1 * 1 more * some PR feedback * symbol addr update * UnsetCamera0Flag1000 * SetPlayerSpriteSet2 * action 18 * encounter + a smol hammer * git subrepo pull (merge) tools/splat subrepo: subdir: "tools/splat" merged: "8cf482fe57" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4c0a93eaed" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * 3 and cleanup * undo yucky union * PR comments * get_enemy_safe * cleanup * move VirtualEntity * attempt to fix doxygen
254 lines
7.7 KiB
Python
Executable File
254 lines
7.7 KiB
Python
Executable File
#!/usr/bin/python3
|
|
|
|
import os
|
|
import re
|
|
import subprocess
|
|
import sys
|
|
|
|
script_dir = os.path.dirname(os.path.realpath(__file__))
|
|
root_dir = script_dir + "/../"
|
|
|
|
current_ver_dir = script_dir + "/../ver/current/"
|
|
asm_dir = root_dir + "asm/nonmatchings/"
|
|
|
|
symbol_addrs_path = os.path.join(current_ver_dir, "symbol_addrs.txt")
|
|
elf_path = os.path.join(current_ver_dir, "build", "papermario.elf")
|
|
map_path = os.path.join(current_ver_dir, "build", "papermario.map")
|
|
ignores_path = os.path.join(root_dir, "tools", "ignored_funcs.txt")
|
|
|
|
map_symbols = {}
|
|
symbol_addrs = []
|
|
dead_symbols = []
|
|
elf_symbols = []
|
|
|
|
ignores = set()
|
|
|
|
verbose = False
|
|
|
|
def read_ignores():
|
|
with open(ignores_path) as f:
|
|
lines = f.readlines()
|
|
|
|
for line in lines:
|
|
name = line.split(" = ")[0].strip()
|
|
if name != "":
|
|
ignores.add(name)
|
|
|
|
def scan_map():
|
|
ram_offset = None
|
|
cur_file = "<no file>"
|
|
prev_line = ""
|
|
with open(map_path) as f:
|
|
for line in f:
|
|
if "load address" in line:
|
|
ram = int(line[16 : 16 + 18], 0)
|
|
rom = int(line[59 : 59 + 18], 0)
|
|
ram_offset = ram - rom
|
|
continue
|
|
|
|
prev_line = line
|
|
|
|
if (
|
|
ram_offset is None
|
|
or "=" in line
|
|
or "*fill*" in line
|
|
or " 0x" not in line
|
|
):
|
|
continue
|
|
|
|
ram = int(line[16 : 16 + 18], 0)
|
|
rom = ram - ram_offset
|
|
sym = line.split()[-1]
|
|
|
|
if "0x" in sym:
|
|
ram_offset = None
|
|
continue
|
|
elif "/" in sym:
|
|
cur_file = sym
|
|
continue
|
|
|
|
map_symbols[sym] = (rom, cur_file, ram)
|
|
|
|
def read_symbol_addrs():
|
|
unique_lines = set()
|
|
|
|
with open(symbol_addrs_path, "r") as f:
|
|
for line in f.readlines():
|
|
unique_lines.add(line)
|
|
|
|
for line in unique_lines:
|
|
if "_ROM_START" in line or "_ROM_END" in line:
|
|
continue
|
|
|
|
main, ext = line.rstrip().split(";")
|
|
opt = ext.split("//")[-1].strip().split(" ")
|
|
|
|
dead = False
|
|
type = ""
|
|
rom = -1
|
|
|
|
for thing in list(opt):
|
|
if thing.strip() == "":
|
|
opt.remove(thing)
|
|
if "type:" in thing:
|
|
type = thing.split(":")[1]
|
|
opt.remove(thing)
|
|
elif "rom:" in thing:
|
|
rom = int(thing.split(":")[1], 16)
|
|
opt.remove(thing)
|
|
elif "dead:" in thing:
|
|
dead = True
|
|
|
|
eqsplit = main.split(" = ")
|
|
if len(eqsplit) != 2:
|
|
print(f"Line malformed: '{main}'")
|
|
sys.exit(1)
|
|
|
|
name, addr = main.split(" = ")
|
|
|
|
if not dead:
|
|
symbol_addrs.append([name, int(addr, 0), type, rom, opt])
|
|
else:
|
|
dead_symbols.append([name, int(addr, 0), type, rom, opt])
|
|
|
|
def read_elf():
|
|
try:
|
|
result = subprocess.run(['objdump', '-x', elf_path], stdout=subprocess.PIPE)
|
|
objdump_lines = result.stdout.decode().split("\n")
|
|
except:
|
|
print(f"Error: Could not run objdump on {elf_path} - make sure that the project is built")
|
|
sys.exit(1)
|
|
|
|
for line in objdump_lines:
|
|
if " F " in line or " O " in line or " *ABS*" in line:
|
|
components = line.split()
|
|
name = components[-1]
|
|
|
|
if "_ROM_START" in name or "_ROM_END" in name:
|
|
continue
|
|
|
|
if "/" in name or \
|
|
name in ignores or \
|
|
name.startswith("_") or \
|
|
name.startswith("jtbl_") or \
|
|
re.match(r"L[0-9A-F]{8}", name):
|
|
continue
|
|
|
|
addr = int(components[0], 16)
|
|
if " F " in line or name.startswith("func_"):
|
|
type = "func"
|
|
else:
|
|
type = "data"
|
|
|
|
rom = None
|
|
|
|
if name in map_symbols:
|
|
rom = map_symbols[name][0]
|
|
elif re.match(".*_[0-9A-F]{8}_[0-9A-F]{6}", name):
|
|
rom = int(name.split('_')[-1], 16)
|
|
|
|
elf_symbols.append((name, addr, type, rom))
|
|
|
|
def log(s):
|
|
if verbose:
|
|
print(s)
|
|
|
|
def reconcile_symbols():
|
|
print(f"Processing {str(len(elf_symbols))} elf symbols...")
|
|
|
|
for i, elf_sym in enumerate(elf_symbols):
|
|
if i % 1000 == 0:
|
|
print(i)
|
|
name_match = None
|
|
rom_match = None
|
|
|
|
for known_sym in symbol_addrs:
|
|
# Name
|
|
if not name_match:
|
|
if elf_sym[0] == known_sym[0]:
|
|
name_match = known_sym
|
|
|
|
if elf_sym[1] != known_sym[1]:
|
|
log(f"Ram mismatch! {elf_sym[0]} is 0x{elf_sym[1]:X} in the elf and 0x{known_sym[1]} in symbol_addrs")
|
|
|
|
# Rom
|
|
if not rom_match:
|
|
# Todo account for either or both syms not containing a rom addr
|
|
if elf_sym[3]:
|
|
if elf_sym[3] == known_sym[3]:
|
|
rom_match = known_sym
|
|
|
|
if not name_match and not rom_match:
|
|
log(f"Creating new symbol {elf_sym[0]}")
|
|
symbol_addrs.append([elf_sym[0], elf_sym[1], elf_sym[2], elf_sym[3] if elf_sym[3] else -1, []])
|
|
elif not name_match:
|
|
log(f"Renaming identical rom address symbol {rom_match[0]} to {elf_sym[0]}")
|
|
rom_match[0] = elf_sym[0]
|
|
elif not rom_match and elf_sym[3]:
|
|
if name_match[3] >= 0:
|
|
log(f"Correcting rom address {name_match[3]} to {elf_sym[3]} for symbol {name_match[0]}")
|
|
else:
|
|
log(f"Adding rom address {elf_sym[3]} to symbol {name_match[0]}")
|
|
name_match[3] = elf_sym[3]
|
|
|
|
def write_new_symbol_addrs():
|
|
with open(symbol_addrs_path, "w", newline="\n") as f:
|
|
for symbol in sorted(symbol_addrs, key=lambda x: (x[3] == -1, x[3], x[1], x[0])):
|
|
line = f"{symbol[0]} = 0x{symbol[1]:X}; //"
|
|
if symbol[2] and len(symbol[2]) > 0:
|
|
line += f" type:{symbol[2]}"
|
|
if symbol[3] >= 0:
|
|
line += f" rom:0x{symbol[3]:X}"
|
|
if len(symbol[4]) > 0:
|
|
for thing in symbol[4]:
|
|
line += f" {thing}"
|
|
f.write(line + "\n")
|
|
for symbol in sorted(dead_symbols, key=lambda x: (x[3] == -1, x[3], x[1], x[0])):
|
|
line = f"{symbol[0]} = 0x{symbol[1]:X}; //"
|
|
if symbol[2] and len(symbol[2]) > 0:
|
|
line += f" type:{symbol[2]}"
|
|
if symbol[3] >= 0:
|
|
line += f" rom:0x{symbol[3]:X}"
|
|
if len(symbol[4]) > 0:
|
|
for thing in symbol[4]:
|
|
line += f" {thing}"
|
|
f.write(line + "\n")
|
|
|
|
read_ignores()
|
|
scan_map()
|
|
read_symbol_addrs()
|
|
|
|
# chicken scratch cod to print out new / renamed symbols
|
|
# with open("tools/new_syms.txt") as f:
|
|
# new_syms = f.readlines()
|
|
|
|
# new_sym_dict = {}
|
|
# for sym_line in new_syms:
|
|
# sym_line = sym_line.strip()
|
|
# if sym_line:
|
|
# name, rest = sym_line.split(" = ")
|
|
# vram = int(rest.split(";")[0], 0)
|
|
# new_sym_dict[vram] = name
|
|
|
|
# renames = []
|
|
# adds = []
|
|
# for addr in new_sym_dict:
|
|
# found = False
|
|
# for thing in symbol_addrs:
|
|
# if thing[1] == addr and not thing[0].startswith("func_") and not thing[0].startswith("D_"):
|
|
# if new_sym_dict[addr] != thing[0]:
|
|
# renames.append(f"{thing[0]} -> {new_sym_dict[addr]}")
|
|
# found = True
|
|
# break
|
|
# if not found:
|
|
# adds.append(f"{new_sym_dict[addr]} = {addr:X}")
|
|
|
|
# for r in renames:
|
|
# print(r)
|
|
# for a in adds:
|
|
# print(a)
|
|
|
|
read_elf()
|
|
reconcile_symbols()
|
|
write_new_symbol_addrs()
|