mirror of
https://github.com/HarbourMasters/2ship2harkinian.git
synced 2024-11-23 22: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>
256 lines
6.7 KiB
Python
Executable File
256 lines
6.7 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
import argparse
|
|
import os.path
|
|
from subprocess import check_call
|
|
|
|
parser = argparse.ArgumentParser(
|
|
description="Find the first difference(s) between the built ROM and the base ROM."
|
|
)
|
|
parser.add_argument(
|
|
"-c",
|
|
"--count",
|
|
type=int,
|
|
default=5,
|
|
help="find up to this many instruction difference(s)",
|
|
)
|
|
parser.add_argument(
|
|
"-d",
|
|
"--diff",
|
|
dest="diff_args",
|
|
nargs="?",
|
|
action="store",
|
|
default=False,
|
|
const="prompt",
|
|
help="run diff.py on the result with the provided arguments"
|
|
)
|
|
parser.add_argument(
|
|
"-m", "--make", help="run make before finding difference(s)", action="store_true"
|
|
)
|
|
args = parser.parse_args()
|
|
|
|
diff_count = args.count
|
|
|
|
if args.make:
|
|
check_call(["make", "-j4", "COMPARE=0"])
|
|
|
|
baseimg = f"baserom_uncompressed.z64"
|
|
basemap = f"expected/build/mm.map"
|
|
|
|
myimg = f"mm.us.rev1.rom_uncompressed.z64"
|
|
mymap = f"build/mm.map"
|
|
|
|
if not os.path.isfile(baseimg):
|
|
print(f"{baseimg} must exist.")
|
|
exit(1)
|
|
if not os.path.isfile(myimg) or not os.path.isfile(mymap):
|
|
print(f"{myimg} and {mymap} must exist.")
|
|
exit(1)
|
|
|
|
mybin = open(myimg, "rb").read()
|
|
basebin = open(baseimg, "rb").read()
|
|
|
|
if len(mybin) != len(basebin):
|
|
print("Modified ROM has different size...")
|
|
exit(1)
|
|
|
|
if mybin == basebin:
|
|
print("No differences!")
|
|
exit(0)
|
|
|
|
|
|
def search_rom_address(target_addr):
|
|
ram_offset = None
|
|
prev_ram = 0
|
|
prev_rom = 0
|
|
prev_sym = "<start of rom>"
|
|
cur_file = "<no file>"
|
|
prev_file = cur_file
|
|
prev_line = ""
|
|
with open(mymap) as f:
|
|
for line in f:
|
|
if "load address" in line:
|
|
# Ignore .bss sections since we're looking for a ROM address
|
|
if ".bss" in line or ".bss" 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
|
|
sym = line.split()[-1]
|
|
|
|
if "0x" in sym and "/" not in sym:
|
|
ram_offset = None
|
|
continue
|
|
if "/" in sym:
|
|
cur_file = sym
|
|
continue
|
|
|
|
if rom > target_addr:
|
|
return f"{prev_sym} (RAM 0x{prev_ram:X}, ROM 0x{prev_rom:X}, {prev_file})"
|
|
|
|
prev_ram = ram
|
|
prev_rom = rom
|
|
prev_sym = sym
|
|
prev_file = cur_file
|
|
|
|
return "at end of rom?"
|
|
|
|
|
|
def parse_map(map_fname):
|
|
ram_offset = None
|
|
cur_file = "<no file>"
|
|
syms = {}
|
|
prev_sym = None
|
|
prev_line = ""
|
|
with open(map_fname) 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 and "/" not in sym:
|
|
ram_offset = None
|
|
continue
|
|
elif "/" in sym:
|
|
cur_file = sym
|
|
continue
|
|
|
|
syms[sym] = (rom, cur_file, prev_sym, ram)
|
|
prev_sym = sym
|
|
|
|
return syms
|
|
|
|
|
|
def map_diff():
|
|
map1 = parse_map(mymap)
|
|
map2 = parse_map(basemap)
|
|
min_ram = None
|
|
found = None
|
|
for sym, addr in map1.items():
|
|
if sym not in map2:
|
|
continue
|
|
if addr[0] != map2[sym][0]:
|
|
if min_ram is None or addr[0] < min_ram:
|
|
min_ram = addr[0]
|
|
found = (sym, addr[1], addr[2])
|
|
if min_ram is None:
|
|
return False
|
|
else:
|
|
print(
|
|
f"Map appears to have shifted just before {found[0]} ({found[1]}) -- in {found[2]}?"
|
|
)
|
|
if found[2] is not None and found[2] not in map2:
|
|
print(
|
|
f"(Base map file {basemap} out of date due to new or renamed symbols, so result may be imprecise.)"
|
|
)
|
|
return True
|
|
|
|
|
|
def hexbytes(bs):
|
|
return ":".join("{:02X}".format(c) for c in bs)
|
|
|
|
|
|
found_instr_diff = []
|
|
map_search_diff = []
|
|
diffs = 0
|
|
shift_cap = 1000
|
|
for i in range(24, len(mybin), 4):
|
|
# (mybin[i:i+4] != basebin[i:i+4], but that's slightly slower in CPython...)
|
|
if diffs <= shift_cap and (
|
|
mybin[i] != basebin[i]
|
|
or mybin[i + 1] != basebin[i + 1]
|
|
or mybin[i + 2] != basebin[i + 2]
|
|
or mybin[i + 3] != basebin[i + 3]
|
|
):
|
|
if diffs == 0:
|
|
print(f"First difference at ROM addr 0x{i:X}, {search_rom_address(i)}")
|
|
print(
|
|
f"Bytes: {hexbytes(mybin[i : i + 4])} vs {hexbytes(basebin[i : i + 4])}"
|
|
)
|
|
diffs += 1
|
|
if (
|
|
len(found_instr_diff) < diff_count
|
|
and mybin[i] >> 2 != basebin[i] >> 2
|
|
and not search_rom_address(i) in map_search_diff
|
|
):
|
|
found_instr_diff.append(i)
|
|
map_search_diff.append(search_rom_address(i))
|
|
|
|
if diffs == 0:
|
|
print("No differences but ROMs differ?")
|
|
exit()
|
|
|
|
if len(found_instr_diff) > 0:
|
|
for i in found_instr_diff:
|
|
print(f"Instruction difference at ROM addr 0x{i:X}, {search_rom_address(i)}")
|
|
print(
|
|
f"Bytes: {hexbytes(mybin[i : i + 4])} vs {hexbytes(basebin[i : i + 4])}"
|
|
)
|
|
print()
|
|
|
|
definite_shift = diffs > shift_cap
|
|
if definite_shift:
|
|
print(f"Over {shift_cap} differing words, must be a shifted ROM.")
|
|
else:
|
|
print(f"{diffs} differing word(s).")
|
|
|
|
if diffs > 100:
|
|
if not os.path.isfile(basemap):
|
|
print(
|
|
f"To find ROM shifts, copy a clean .map file to {basemap} and rerun this script."
|
|
)
|
|
elif not map_diff():
|
|
print(f"No ROM shift{' (!?)' if definite_shift else ''}")
|
|
|
|
if args.diff_args:
|
|
if len(found_instr_diff) < 1:
|
|
print(f"No instruction difference to run diff.py on")
|
|
exit()
|
|
|
|
diff_sym = search_rom_address(found_instr_diff[0]).split()[0]
|
|
if args.diff_args == "prompt":
|
|
diff_args = input("Call diff.py with which arguments? ") or "--"
|
|
else:
|
|
diff_args = args.diff_args
|
|
if diff_args[0] != "-":
|
|
diff_args = "-" + diff_args
|
|
check_call(
|
|
[
|
|
"python3",
|
|
"diff.py",
|
|
diff_args,
|
|
diff_sym,
|
|
]
|
|
)
|