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>
200 lines
6.4 KiB
Python
Executable File
200 lines
6.4 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
import argparse, math, os, re
|
|
|
|
script_dir = os.path.dirname(os.path.realpath(__file__))
|
|
root_dir = script_dir + "/../"
|
|
asm_dir = root_dir + "asm/non_matchings/overlays/actors"
|
|
build_dir = root_dir + "build/src/overlays/actors"
|
|
|
|
|
|
def get_num_instructions(f_path):
|
|
with open(f_path) as f:
|
|
f_lines = f.readlines()
|
|
sum = 0
|
|
for line in f_lines:
|
|
if line.startswith("/* "):
|
|
sum += 1
|
|
return sum
|
|
|
|
|
|
def count_non_matching():
|
|
overlays = {}
|
|
|
|
for root, dirs, _ in os.walk(asm_dir):
|
|
for actor_dir in dirs:
|
|
total_size = 0
|
|
max_size = -1
|
|
ovl_path = os.path.join(root, actor_dir)
|
|
num_files = 0
|
|
|
|
actor_funcs = {}
|
|
|
|
for f_name in os.listdir(ovl_path):
|
|
file_path = os.path.join(ovl_path, f_name)
|
|
file_size = get_num_instructions(file_path)
|
|
|
|
num_files += 1
|
|
total_size += file_size
|
|
if file_size > max_size:
|
|
max_size = file_size
|
|
actor_funcs[f_name] = file_size
|
|
|
|
overlays[actor_dir] = {
|
|
"summary": (num_files, max_size, total_size,
|
|
total_size / num_files),
|
|
"funcs": actor_funcs
|
|
}
|
|
|
|
return overlays
|
|
|
|
|
|
pattern_function = re.compile("^[0-9a-fA-F]+ <(.+)>:")
|
|
pattern_switchcase = re.compile("L[0-9a-fA-F]{8}")
|
|
|
|
def count_builded_funcs_and_instructions(f_path):
|
|
f_lines = ""
|
|
with open(f_path) as f:
|
|
f_lines = f.readlines()
|
|
|
|
current = ""
|
|
funcs = {}
|
|
for line in f_lines:
|
|
if line.strip() == "":
|
|
continue
|
|
match_function = pattern_function.match(line)
|
|
if match_function:
|
|
func_name = match_function.group(1)
|
|
if pattern_switchcase.match(func_name):
|
|
# this is not a real function tag.
|
|
# probably a case from a switch
|
|
# for example: <L80979A80>
|
|
continue
|
|
current = func_name
|
|
funcs[current] = 0
|
|
elif current != "":
|
|
funcs[current] += 1
|
|
return funcs
|
|
|
|
|
|
def count_build():
|
|
overlays = {}
|
|
|
|
for root, dirs, _ in os.walk(build_dir):
|
|
for actor_dir in dirs:
|
|
total_size = 0
|
|
max_size = -1
|
|
ovl_path = os.path.join(root, actor_dir)
|
|
num_files = 0
|
|
|
|
actor_funcs = {}
|
|
|
|
for f_name in os.listdir(ovl_path):
|
|
if not f_name.endswith(".s"):
|
|
continue
|
|
if f_name.endswith("_reloc.s"):
|
|
continue
|
|
|
|
file_path = os.path.join(ovl_path, f_name)
|
|
funcs = count_builded_funcs_and_instructions(file_path)
|
|
|
|
if len(funcs) > 0:
|
|
num_files += len(funcs)
|
|
# round up the file size to a multiple of four.
|
|
total_size += math.ceil(sum(funcs.values())/4)*4
|
|
max_size = max(max_size, max(funcs.values()))
|
|
# merges both dictionaries
|
|
actor_funcs = {**actor_funcs, **funcs}
|
|
|
|
overlays[actor_dir] = {
|
|
"summary": (num_files, max_size, total_size,
|
|
total_size / num_files),
|
|
"funcs": actor_funcs
|
|
}
|
|
|
|
return overlays
|
|
|
|
|
|
def get_list_from_file(filename):
|
|
actor_list = []
|
|
if filename is not None:
|
|
with open(filename) as f:
|
|
actor_list = list(map(lambda x: x.strip().split(",")[0], f.readlines()))
|
|
return actor_list
|
|
|
|
|
|
def print_csv(overlays, ignored, include_only):
|
|
sorted_actors = [(k, v["summary"]) for k, v in overlays.items()]
|
|
sorted_actors.sort()
|
|
|
|
row = "{},{},{},{},{}"
|
|
print(row.format("Overlay", "Num files", "Max size", "Total size", "Average size"))
|
|
|
|
for actor_data in sorted_actors:
|
|
name = actor_data[0]
|
|
other = actor_data[1]
|
|
if name in ignored:
|
|
continue
|
|
if include_only and name not in include_only:
|
|
continue
|
|
print(row.format(name, *other))
|
|
|
|
|
|
def print_function_lines(overlays, ignored, include_only):
|
|
sorted_actors = []
|
|
for k, v in overlays.items():
|
|
func_data = []
|
|
for func_name, lines in v["funcs"].items():
|
|
func_data.append((func_name, lines))
|
|
#func_data.sort(key=lambda x: x[1], reverse=True)
|
|
sorted_actors.append((k, func_data))
|
|
sorted_actors.sort()
|
|
|
|
row = "{},{},{}"
|
|
print(row.format("actor_name", "function_name", "lines"))
|
|
|
|
for actor_data in sorted_actors:
|
|
name = actor_data[0]
|
|
func_data = actor_data[1]
|
|
if name in ignored:
|
|
continue
|
|
if include_only and name not in include_only:
|
|
continue
|
|
for func_name, lines in func_data:
|
|
print(row.format(name, func_name, lines))
|
|
|
|
|
|
def main():
|
|
description = "Collects actor's functions sizes, and print them in csv format."
|
|
|
|
epilog = """\
|
|
To make a .csv with the data, simply redirect the output. For example:
|
|
./tools/get_actor_sizes.py > results.csv
|
|
|
|
Flags can be mixed to produce a customized result:
|
|
./tools/get_actor_sizes.py --function-lines --non-matching > status.csv
|
|
./tools/get_actor_sizes.py --non-matching --ignore pull_request.csv > non_matching.csv
|
|
./tools/get_actor_sizes.py --non-matching --function-lines --include-only my_reserved.csv > my_status.csv
|
|
"""
|
|
parser = argparse.ArgumentParser(description=description, epilog=epilog, formatter_class=argparse.RawTextHelpFormatter)
|
|
parser.add_argument("--non-matching", help="Collect data of the non-matching actors instead.", action="store_true")
|
|
parser.add_argument("--function-lines", help="Prints the size of every function instead of a summary.", action="store_true")
|
|
parser.add_argument("--ignore", help="Path to a file containing actor's names. The data of actors in this list will be ignored.")
|
|
parser.add_argument("--include-only", help="Path to a file containing actor's names. Only data of actors in this list will be printed.")
|
|
args = parser.parse_args()
|
|
|
|
if args.non_matching:
|
|
overlays = count_non_matching()
|
|
else:
|
|
overlays = count_build()
|
|
|
|
ignored = get_list_from_file(args.ignore)
|
|
include_only = get_list_from_file(args.include_only)
|
|
|
|
if args.function_lines:
|
|
print_function_lines(overlays, ignored, include_only)
|
|
else:
|
|
print_csv(overlays, ignored, include_only)
|
|
|
|
main()
|