Matches, Cleanup, and function splitting (#242)

* Minor labeling during some investigation * Match func_8006CCF0 * func_80093A40 * Match func_80094170 * Match func_80004A60 * Get func_80093D40 a little closer to matching * Match menu_track_select_loop * Match some for loops that were weird before. They needed to be one liners * Match debug_print_fixed_matrix_values * Match func_800867D4 and combine two structs into one * Fixed warnings in load_screen * Fix multiple funcs being in one file, and match them. * Split functions out of func_80069A40, and match. * Fix previous commit by matching func_80069ACC * Split a function out of func_800A718C, and match it. Then do a near match of func_80085B9C. * Split and match func_800B61E0 * Split and match 2 funcs from func_800048D8 * Split functions out of setupOSTasks * Split out a few more funcs, and match an empty one * Split out more functions * Splitting more funcs again * Split more funcs out, and match a couple on the wa * Update score * Update progress script to include unmatched lib funcs, and fix the shield output. * Fix progress.py counting labels as unique functions, and kind of match update_spatial_audio_position * Apply suggestions * Missed a change
2026-06-19 01:16:26 -07:00 · 2022-08-28 07:02:05 -04:00
parent 3a2fa13e5c
commit 3dd6118172
81 changed files with 2023 additions and 3520 deletions
@@ -0,0 +1,123 @@
+#!/usr/bin/env python3
+
+import argparse
+import git
+import os
+import subprocess
+import sys
+from colour import Color
+
+script_dir = os.path.dirname(os.path.realpath(__file__))
+root_dir = os.path.join(script_dir, "..", "..")
+asm_dir = os.path.join(root_dir, "asm", "non_matchings")
+asm_lib_dir = os.path.join(root_dir, "lib", "asm", "non_matchings")
+build_dir = os.path.join(root_dir, "build", "us_1.0")
+elf_path = os.path.join(build_dir, "dkr.elf")
+
+def get_func_sizes():
+    try:
+        result = subprocess.run(['objdump', '-x', elf_path], stdout=subprocess.PIPE)
+        nm_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)
+
+    sizes = {}
+    total = 0
+
+    for line in nm_lines:
+        if " F " in line:
+            components = line.split()
+            size = int(components[4], 16)
+            name = components[5]
+            #Labels are coming through here as functions, and this finds and ignores them
+            if name[0:4] != "L800":
+                total += size
+                sizes[name] = size
+
+    return sizes, total
+
+def get_nonmatching_funcs():
+    funcs = set()
+
+    for root, dirs, files in os.walk(asm_dir):
+        for f in files:
+            if f.endswith(".s"):
+                funcs.add(f[:-2])
+
+    for root, dirs, files in os.walk(asm_lib_dir):
+        for f in files:
+            if f.endswith(".s"):
+                funcs.add(f[:-2])
+
+    return funcs
+
+def get_funcs_sizes(sizes, matchings, nonmatchings):
+    msize = 0
+    nmsize = 0
+
+    for func in matchings:
+        msize += sizes[func]
+
+    for func in nonmatchings:
+        if func not in sizes:
+            pass
+            # print(func)
+        else:
+            nmsize += sizes[func]
+            #print("% s,%i" % (func, sizes[func]))
+
+    return msize, nmsize
+
+def lerp(a, b, alpha):
+    return a + (b - a) * alpha
+
+def main(args):
+    func_sizes, total_size = get_func_sizes()
+    all_funcs = set(func_sizes.keys())
+
+    nonmatching_funcs = get_nonmatching_funcs()
+    matching_funcs = all_funcs - nonmatching_funcs
+
+    matching_size, nonmatching_size = get_funcs_sizes(func_sizes, matching_funcs, nonmatching_funcs)
+
+    if len(all_funcs) == 0:
+        funcs_matching_ratio = 0.0
+        matching_ratio = 0.0
+    else:
+        funcs_matching_ratio = (len(matching_funcs) / len(all_funcs)) * 100
+        matching_ratio = (matching_size / total_size) * 100
+
+    if args.csv:
+        version = 1
+        git_object = git.Repo().head.object
+        timestamp = str(git_object.committed_date)
+        git_hash = git_object.hexsha
+        csv_list = [str(version), timestamp, git_hash, str(len(all_funcs)), str(len(nonmatching_funcs)),
+                    str(len(matching_funcs)), str(total_size), str(nonmatching_size), str(matching_size)]
+        print(",".join(csv_list))
+    elif args.shield_json:
+        import json
+
+        # https://shields.io/endpoint
+        color = Color("#50ca22", hue=lerp(0, 105/255, matching_ratio / 100))
+        print(json.dumps({
+            "schemaVersion": 1,
+            "label": f"progress",
+            "message": f"{matching_ratio:.2f}%",
+            "color": color.hex,
+        }))
+    else:
+        if matching_size + nonmatching_size != total_size:
+            print("Warning: category/total size mismatch!\n")
+        print(f"{len(matching_funcs)} matched functions / {len(all_funcs)} total ({funcs_matching_ratio:.2f}%)")
+        print(f"{matching_size} matching bytes / {total_size} total ({matching_ratio:.2f}%)")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Reports progress for the project")
+    parser.add_argument("--csv", action="store_true")
+    parser.add_argument("--shield-json", action="store_true")
+    args = parser.parse_args()
+
+    main(args)