mirror of
https://github.com/zeldaret/mm.git
synced 2024-11-24 05:19:53 +00:00
7743e5a2c4
* wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
174 lines
4.7 KiB
Python
Executable File
174 lines
4.7 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
import argparse, os, sys
|
|
from collections import OrderedDict
|
|
|
|
script_dir = os.path.dirname(os.path.realpath(__file__))
|
|
root_dir = script_dir + "/../"
|
|
asm_dir = root_dir + "asm/non_matchings/overlays"
|
|
build_dir = root_dir + "build/"
|
|
|
|
def read_rom():
|
|
with open("baserom_uncompressed.z64", "rb") as f:
|
|
return f.read()
|
|
|
|
|
|
def find_dir(query):
|
|
for root, dirs, files in os.walk(asm_dir):
|
|
for d in dirs:
|
|
if d == query:
|
|
return os.path.join(root, d)
|
|
return None
|
|
|
|
|
|
def get_all_s_files():
|
|
ret = set()
|
|
for root, dirs, files in os.walk(asm_dir):
|
|
for f in files:
|
|
if f.endswith(".s"):
|
|
ret.add(f[:-2])
|
|
return ret
|
|
|
|
|
|
def get_symbol_bytes(offsets, func):
|
|
if func not in offsets or "start" not in offsets[func] or "end" not in offsets[func]:
|
|
return None
|
|
start = offsets[func]["start"]
|
|
end = offsets[func]["end"]
|
|
return list(rom_bytes[start:end])
|
|
|
|
|
|
def parse_map(fname):
|
|
ram_offset = None
|
|
cur_file = "<no file>"
|
|
syms = {}
|
|
prev_sym = None
|
|
prev_line = ""
|
|
with open(fname) as f:
|
|
for line in f:
|
|
if "load address" in line:
|
|
if "noload" in line or "noload" in prev_line:
|
|
ram_offset = None
|
|
continue
|
|
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
|
|
fn = line.split()[-1]
|
|
if "0x" in fn:
|
|
ram_offset = None
|
|
elif "/" in fn:
|
|
cur_file = fn
|
|
else:
|
|
syms[fn] = (rom, cur_file, prev_sym, ram)
|
|
prev_sym = fn
|
|
return syms
|
|
|
|
|
|
def get_map_offsets(syms):
|
|
offsets = {}
|
|
for sym in syms:
|
|
prev_sym = syms[sym][2]
|
|
if sym not in offsets:
|
|
offsets[sym] = {}
|
|
if prev_sym not in offsets:
|
|
offsets[prev_sym] = {}
|
|
offsets[sym]["start"] = syms[sym][0]
|
|
offsets[prev_sym]["end"] = syms[sym][0]
|
|
return offsets
|
|
|
|
|
|
def diff_syms(qb, tb):
|
|
if len(tb) < 8:
|
|
return 0
|
|
|
|
if len(qb) > len(tb):
|
|
larger = qb
|
|
smaller = tb
|
|
else:
|
|
larger = tb
|
|
smaller = qb
|
|
|
|
len_ratio = len(smaller) / len(larger)
|
|
|
|
n_bytes = len(smaller)
|
|
matches = 0
|
|
for i in range(0, n_bytes, 4):
|
|
if smaller[i] == larger[i]:
|
|
matches += 4
|
|
return (matches / n_bytes) * len_ratio
|
|
|
|
|
|
def get_matches(query):
|
|
query_bytes = get_symbol_bytes(map_offsets, query)
|
|
if query_bytes is None:
|
|
sys.exit("Symbol '" + query + "' not found")
|
|
|
|
ret = {}
|
|
for symbol in map_offsets:
|
|
if symbol is not None and query != symbol:
|
|
target_bytes = get_symbol_bytes(map_offsets, symbol)
|
|
if target_bytes is not None:
|
|
score = diff_syms(query_bytes, target_bytes)
|
|
if score >= args.threshold:
|
|
ret[symbol] = score
|
|
return OrderedDict(sorted(ret.items(), key=lambda kv: kv[1], reverse=True))
|
|
|
|
|
|
def do_query(query):
|
|
matches = get_matches(query)
|
|
num_matches = len(matches)
|
|
|
|
if num_matches == 0:
|
|
print(query + " - found no matches")
|
|
return
|
|
|
|
i = 0
|
|
more_str = ":"
|
|
if args.num_out < num_matches:
|
|
more_str = " (showing only " + str(args.num_out) + "):"
|
|
|
|
print(query + " - found " + str(num_matches) + " matches total" + more_str)
|
|
for match in matches:
|
|
if i == args.num_out:
|
|
break
|
|
match_str = "{:.2f} - {}".format(matches[match], match)
|
|
if match not in s_files:
|
|
match_str += " (decompiled)"
|
|
print(match_str)
|
|
i += 1
|
|
print()
|
|
|
|
parser = argparse.ArgumentParser(description="Tools to assist with decomp")
|
|
parser.add_argument("query", help="function or file")
|
|
parser.add_argument("--threshold", help="score threshold between 0 and 1 (higher is more restrictive)", type=float, default=0.95, required=False)
|
|
parser.add_argument("--num-out", help="number of functions to display", type=int, default=10, required=False)
|
|
|
|
args = parser.parse_args()
|
|
|
|
rom_bytes = read_rom()
|
|
map_syms = parse_map(build_dir + "mm.map")
|
|
map_offsets = get_map_offsets(map_syms)
|
|
|
|
s_files = get_all_s_files()
|
|
|
|
query_dir = find_dir(args.query)
|
|
|
|
if query_dir is not None:
|
|
files = os.listdir(query_dir)
|
|
for f_name in files:
|
|
do_query(f_name[:-2])
|
|
else:
|
|
do_query(args.query)
|