sm64coopdx/diff.py

1013 lines
31 KiB
Python
Raw Normal View History

2019-12-02 02:52:53 +00:00
#!/usr/bin/env python3
import sys
import re
import os
import ast
import argparse
import subprocess
import difflib
import string
import itertools
import threading
import queue
import time
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def fail(msg):
print(msg, file=sys.stderr)
sys.exit(1)
2020-06-02 16:44:34 +00:00
2020-06-18 02:14:59 +00:00
MISSING_PREREQUISITES = (
"Missing prerequisite python module {}. "
"Run `python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein` to install prerequisites (python-Levenshtein only needed for --algorithm=levenshtein)."
)
2019-12-02 02:52:53 +00:00
try:
import attr
from colorama import Fore, Style, Back
import ansiwrap
import watchdog
except ModuleNotFoundError as e:
2020-06-18 02:14:59 +00:00
fail(MISSING_PREREQUISITES.format(e.name))
2019-12-02 02:52:53 +00:00
# Prefer to use diff_settings.py from the current working directory
2020-06-02 16:44:34 +00:00
sys.path.insert(0, ".")
2019-12-02 02:52:53 +00:00
try:
import diff_settings
except ModuleNotFoundError:
fail("Unable to find diff_settings.py in the same directory.")
# ==== CONFIG ====
2020-06-02 16:44:34 +00:00
parser = argparse.ArgumentParser(description="Diff MIPS assembly.")
parser.add_argument("start", help="Function name or address to start diffing from.")
parser.add_argument("end", nargs="?", help="Address to end diff at.")
parser.add_argument(
"-o",
dest="diff_obj",
action="store_true",
help="Diff .o files rather than a whole binary. This makes it possible to see symbol names. (Recommended)",
)
parser.add_argument(
"--base-asm",
dest="base_asm",
metavar="FILE",
help="Read assembly from given file instead of configured base img.",
)
parser.add_argument(
"--write-asm",
dest="write_asm",
metavar="FILE",
help="Write the current assembly output to file, e.g. for use with --base-asm.",
)
parser.add_argument(
"-m",
"--make",
dest="make",
action="store_true",
help="Automatically run 'make' on the .o file or binary before diffing.",
)
parser.add_argument(
"-l",
"--skip-lines",
dest="skip_lines",
type=int,
default=0,
help="Skip the first N lines of output.",
)
parser.add_argument(
"-f",
"--stop-jr-ra",
dest="stop_jrra",
action="store_true",
help="Stop disassembling at the first 'jr ra'. Some functions have multiple return points, so use with care!",
)
parser.add_argument(
"-i",
"--ignore-large-imms",
dest="ignore_large_imms",
action="store_true",
help="Pretend all large enough immediates are the same.",
)
parser.add_argument(
"-B",
"--no-show-branches",
dest="show_branches",
action="store_false",
help="Don't visualize branches/branch targets.",
)
parser.add_argument(
"-S",
"--base-shift",
dest="base_shift",
type=str,
default="0",
help="Diff position X in our img against position X + shift in the base img. "
'Arithmetic is allowed, so e.g. |-S "0x1234 - 0x4321"| is a reasonable '
"flag to pass if it is known that position 0x1234 in the base img syncs "
"up with position 0x4321 in our img. Not supported together with -o.",
)
parser.add_argument(
"-w",
"--watch",
dest="watch",
action="store_true",
help="Automatically update when source/object files change. "
"Recommended in combination with -m.",
)
parser.add_argument(
"--width",
dest="column_width",
type=int,
default=50,
help="Sets the width of the left and right view column.",
)
2020-06-18 02:14:59 +00:00
parser.add_argument(
"--algorithm",
dest="algorithm",
default="difflib",
choices=["levenshtein", "difflib"],
help="Diff algorithm to use.",
)
parser.add_argument(
"--max-size",
"--max-lines",
dest="max_lines",
type=int,
default=1024,
help="The maximum length of the diff, in lines. Not recommended when -f is used.",
)
2019-12-02 02:52:53 +00:00
# Project-specific flags, e.g. different versions/make arguments.
if hasattr(diff_settings, "add_custom_arguments"):
diff_settings.add_custom_arguments(parser)
args = parser.parse_args()
# Set imgs, map file and make flags in a project-specific manner.
config = {}
diff_settings.apply(config, args)
2020-06-02 16:44:34 +00:00
baseimg = config.get("baseimg", None)
myimg = config.get("myimg", None)
mapfile = config.get("mapfile", None)
makeflags = config.get("makeflags", [])
source_directories = config.get("source_directories", None)
2019-12-02 02:52:53 +00:00
2020-06-18 02:14:59 +00:00
MAX_FUNCTION_SIZE_LINES = args.max_lines
MAX_FUNCTION_SIZE_BYTES = MAX_FUNCTION_SIZE_LINES * 4
2019-12-02 02:52:53 +00:00
COLOR_ROTATION = [
Fore.MAGENTA,
Fore.CYAN,
Fore.GREEN,
Fore.RED,
Fore.LIGHTYELLOW_EX,
Fore.LIGHTMAGENTA_EX,
Fore.LIGHTCYAN_EX,
Fore.LIGHTGREEN_EX,
Fore.LIGHTBLACK_EX,
]
2020-06-02 16:44:34 +00:00
BUFFER_CMD = ["tail", "-c", str(10 ** 9)]
2019-12-02 02:52:53 +00:00
LESS_CMD = ["less", "-Ric"]
DEBOUNCE_DELAY = 0.1
2020-06-02 16:44:34 +00:00
FS_WATCH_EXTENSIONS = [".c", ".h"]
2019-12-02 02:52:53 +00:00
# ==== LOGIC ====
2020-06-18 02:14:59 +00:00
if args.algorithm == "levenshtein":
try:
import Levenshtein
except ModuleNotFoundError as e:
fail(MISSING_PREREQUISITES.format(e.name))
2019-12-02 02:52:53 +00:00
binutils_prefix = None
2020-06-02 16:44:34 +00:00
for binutils_cand in ["mips-linux-gnu-", "mips64-elf-"]:
2019-12-02 02:52:53 +00:00
try:
2020-06-02 16:44:34 +00:00
subprocess.check_call(
[binutils_cand + "objdump", "--version"],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
)
2019-12-02 02:52:53 +00:00
binutils_prefix = binutils_cand
break
except subprocess.CalledProcessError:
pass
except FileNotFoundError:
pass
if not binutils_prefix:
2020-06-02 16:44:34 +00:00
fail(
"Missing binutils; please ensure mips-linux-gnu-objdump or mips64-elf-objdump exist."
)
2019-12-02 02:52:53 +00:00
def eval_int(expr, emsg=None):
try:
ret = ast.literal_eval(expr)
if not isinstance(ret, int):
raise Exception("not an integer")
return ret
except Exception:
if emsg is not None:
fail(emsg)
return None
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def run_make(target, capture_output=False):
if capture_output:
2020-06-02 16:44:34 +00:00
return subprocess.run(
["make"] + makeflags + [target],
stderr=subprocess.PIPE,
stdout=subprocess.PIPE,
)
2019-12-02 02:52:53 +00:00
else:
subprocess.check_call(["make"] + makeflags + [target])
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def restrict_to_function(dump, fn_name):
out = []
2020-06-02 16:44:34 +00:00
search = f"<{fn_name}>:"
2019-12-02 02:52:53 +00:00
found = False
2020-06-02 16:44:34 +00:00
for line in dump.split("\n"):
2019-12-02 02:52:53 +00:00
if found:
if len(out) >= MAX_FUNCTION_SIZE_LINES:
break
out.append(line)
elif search in line:
found = True
2020-06-02 16:44:34 +00:00
return "\n".join(out)
2019-12-02 02:52:53 +00:00
def run_objdump(cmd):
flags, target, restrict = cmd
2020-06-02 16:44:34 +00:00
out = subprocess.check_output(
[binutils_prefix + "objdump"] + flags + [target], universal_newlines=True
)
2019-12-02 02:52:53 +00:00
if restrict is not None:
return restrict_to_function(out, restrict)
return out
2020-06-02 16:44:34 +00:00
base_shift = eval_int(
args.base_shift, "Failed to parse --base-shift (-S) argument as an integer."
)
2019-12-02 02:52:53 +00:00
def search_map_file(fn_name):
if not mapfile:
fail(f"No map file configured; cannot find function {fn_name}.")
try:
with open(mapfile) as f:
2020-06-02 16:44:34 +00:00
lines = f.read().split("\n")
2019-12-02 02:52:53 +00:00
except Exception:
fail(f"Failed to open map file {mapfile} for reading.")
try:
cur_objfile = None
ram_to_rom = None
cands = []
2020-06-02 16:44:34 +00:00
last_line = ""
2019-12-02 02:52:53 +00:00
for line in lines:
2020-06-02 16:44:34 +00:00
if line.startswith(" .text"):
2019-12-02 02:52:53 +00:00
cur_objfile = line.split()[3]
2020-06-02 16:44:34 +00:00
if "load address" in line:
2019-12-02 02:52:53 +00:00
tokens = last_line.split() + line.split()
ram = int(tokens[1], 0)
rom = int(tokens[5], 0)
ram_to_rom = rom - ram
2020-06-02 16:44:34 +00:00
if line.endswith(" " + fn_name):
2019-12-02 02:52:53 +00:00
ram = int(line.split()[0], 0)
if cur_objfile is not None and ram_to_rom is not None:
cands.append((cur_objfile, ram + ram_to_rom))
last_line = line
except Exception as e:
import traceback
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
traceback.print_exc()
fail(f"Internal error while parsing map file")
if len(cands) > 1:
fail(f"Found multiple occurrences of function {fn_name} in map file.")
if len(cands) == 1:
return cands[0]
return None, None
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def dump_objfile():
if base_shift:
fail("--base-shift not compatible with -o")
if args.end is not None:
fail("end address not supported together with -o")
2020-06-02 16:44:34 +00:00
if args.start.startswith("0"):
2019-12-02 02:52:53 +00:00
fail("numerical start address not supported with -o; pass a function name")
objfile, _ = search_map_file(args.start)
if not objfile:
fail("Not able to find .o file for function.")
if args.make:
run_make(objfile)
if not os.path.isfile(objfile):
2020-06-18 02:14:59 +00:00
fail(f"Not able to find .o file for function: {objfile} is not a file.")
2019-12-02 02:52:53 +00:00
refobjfile = "expected/" + objfile
if not os.path.isfile(refobjfile):
fail(f'Please ensure an OK .o file exists at "{refobjfile}".')
objdump_flags = ["-drz"]
return (
objfile,
(objdump_flags, refobjfile, args.start),
2020-06-02 16:44:34 +00:00
(objdump_flags, objfile, args.start),
2019-12-02 02:52:53 +00:00
)
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def dump_binary():
if not baseimg or not myimg:
fail("Missing myimg/baseimg in config.")
if args.make:
run_make(myimg)
start_addr = eval_int(args.start)
if start_addr is None:
_, start_addr = search_map_file(args.start)
if start_addr is None:
fail("Not able to find function in map file.")
if args.end is not None:
end_addr = eval_int(args.end, "End address must be an integer expression.")
else:
end_addr = start_addr + MAX_FUNCTION_SIZE_BYTES
2020-06-02 16:44:34 +00:00
objdump_flags = ["-Dz", "-bbinary", "-mmips", "-EB"]
flags1 = [
f"--start-address={start_addr + base_shift}",
f"--stop-address={end_addr + base_shift}",
]
2019-12-02 02:52:53 +00:00
flags2 = [f"--start-address={start_addr}", f"--stop-address={end_addr}"]
return (
myimg,
(objdump_flags + flags1, baseimg, None),
2020-06-02 16:44:34 +00:00
(objdump_flags + flags2, myimg, None),
2019-12-02 02:52:53 +00:00
)
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
# Alignment with ANSI colors is broken, let's fix it.
def ansi_ljust(s, width):
needed = width - ansiwrap.ansilen(s)
if needed > 0:
2020-06-02 16:44:34 +00:00
return s + " " * needed
2019-12-02 02:52:53 +00:00
else:
return s
2020-06-02 16:44:34 +00:00
re_int = re.compile(r"[0-9]+")
re_comments = re.compile(r"<.*?>")
2020-06-18 02:14:59 +00:00
re_regs = re.compile(r"\$?\b(a[0-3]|t[0-9]|s[0-8]|at|v[01]|f[12]?[0-9]|f3[01]|fp)\b")
re_sprel = re.compile(r",([0-9]+|0x[0-9a-f]+)\(sp\)")
2020-06-02 16:44:34 +00:00
re_large_imm = re.compile(r"-?[1-9][0-9]{2,}|-?0x[0-9a-f]{3,}")
2020-06-18 02:14:59 +00:00
re_imm = re.compile(r"(\b|-)([0-9]+|0x[0-9a-fA-F]+)\b(?!\(sp)|%(lo|hi)\([^)]*\)")
2020-06-02 16:44:34 +00:00
forbidden = set(string.ascii_letters + "_")
2020-06-18 02:14:59 +00:00
branch_likely_instructions = {
"beql",
"bnel",
"beqzl",
"bnezl",
"bgezl",
"bgtzl",
"blezl",
"bltzl",
"bc1tl",
"bc1fl",
}
branch_instructions = branch_likely_instructions.union(
{"b", "beq", "bne", "beqz", "bnez", "bgez", "bgtz", "blez", "bltz", "bc1t", "bc1f"}
2020-06-02 16:44:34 +00:00
)
2020-06-18 02:14:59 +00:00
jump_instructions = branch_instructions.union({"jal", "j"})
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def hexify_int(row, pat):
full = pat.group(0)
if len(full) <= 1:
# leave one-digit ints alone
return full
start, end = pat.span()
if start and row[start - 1] in forbidden:
return full
if end < len(row) and row[end] in forbidden:
return full
return hex(int(full))
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def parse_relocated_line(line):
try:
2020-06-02 16:44:34 +00:00
ind2 = line.rindex(",")
2019-12-02 02:52:53 +00:00
except ValueError:
2020-06-02 16:44:34 +00:00
ind2 = line.rindex("\t")
before = line[: ind2 + 1]
after = line[ind2 + 1 :]
ind2 = after.find("(")
2019-12-02 02:52:53 +00:00
if ind2 == -1:
2020-06-02 16:44:34 +00:00
imm, after = after, ""
2019-12-02 02:52:53 +00:00
else:
imm, after = after[:ind2], after[ind2:]
2020-06-02 16:44:34 +00:00
if imm == "0x0":
imm = "0"
2019-12-02 02:52:53 +00:00
return before, imm, after
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def process_reloc(row, prev):
before, imm, after = parse_relocated_line(prev)
repl = row.split()[-1]
2020-06-02 16:44:34 +00:00
if imm != "0":
if before.strip() == "jal" and not imm.startswith("0x"):
imm = "0x" + imm
repl += "+" + imm if int(imm, 0) > 0 else imm
if "R_MIPS_LO16" in row:
repl = f"%lo({repl})"
elif "R_MIPS_HI16" in row:
2019-12-02 02:52:53 +00:00
# Ideally we'd pair up R_MIPS_LO16 and R_MIPS_HI16 to generate a
# correct addend for each, but objdump doesn't give us the order of
# the relocations, so we can't find the right LO16. :(
2020-06-02 16:44:34 +00:00
repl = f"%hi({repl})"
2019-12-02 02:52:53 +00:00
else:
2020-06-02 16:44:34 +00:00
assert "R_MIPS_26" in row, f"unknown relocation type '{row}'"
2019-12-02 02:52:53 +00:00
return before + repl + after
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def process(lines):
mnemonics = []
diff_rows = []
2020-06-18 02:14:59 +00:00
rows_with_imms = []
2019-12-02 02:52:53 +00:00
skip_next = False
originals = []
line_nums = []
branch_targets = []
if not args.diff_obj:
lines = lines[7:]
if lines and not lines[-1]:
lines.pop()
for row in lines:
2020-06-02 16:44:34 +00:00
if args.diff_obj and (">:" in row or not row):
2019-12-02 02:52:53 +00:00
continue
2020-06-02 16:44:34 +00:00
if "R_MIPS_" in row:
2020-06-18 02:14:59 +00:00
# N.B. Don't transform the diff rows, they already ignore immediates
# if diff_rows[-1] != '<delay-slot>':
# diff_rows[-1] = process_reloc(row, rows_with_imms[-1])
2019-12-02 02:52:53 +00:00
originals[-1] = process_reloc(row, originals[-1])
continue
2020-06-02 16:44:34 +00:00
row = re.sub(re_comments, "", row)
2019-12-02 02:52:53 +00:00
row = row.rstrip()
2020-06-02 16:44:34 +00:00
tabs = row.split("\t")
row = "\t".join(tabs[2:])
2019-12-02 02:52:53 +00:00
line_num = tabs[0].strip()
2020-06-02 16:44:34 +00:00
row_parts = row.split("\t", 1)
2019-12-02 02:52:53 +00:00
mnemonic = row_parts[0].strip()
2020-06-18 02:14:59 +00:00
if mnemonic not in jump_instructions:
2019-12-02 02:52:53 +00:00
row = re.sub(re_int, lambda s: hexify_int(row, s), row)
original = row
if skip_next:
skip_next = False
2020-06-02 16:44:34 +00:00
row = "<delay-slot>"
mnemonic = "<delay-slot>"
2019-12-02 02:52:53 +00:00
if mnemonic in branch_likely_instructions:
skip_next = True
2020-06-02 16:44:34 +00:00
row = re.sub(re_regs, "<reg>", row)
row = re.sub(re_sprel, ",addr(sp)", row)
2020-06-18 02:14:59 +00:00
row_with_imm = row
if mnemonic in jump_instructions:
row = row.strip()
row, _ = split_off_branch(row)
row += "<imm>"
else:
row = re.sub(re_imm, "<imm>", row)
2019-12-02 02:52:53 +00:00
mnemonics.append(mnemonic)
2020-06-18 02:14:59 +00:00
rows_with_imms.append(row_with_imm)
2019-12-02 02:52:53 +00:00
diff_rows.append(row)
originals.append(original)
line_nums.append(line_num)
if mnemonic in branch_instructions:
2020-06-02 16:44:34 +00:00
target = row_parts[1].strip().split(",")[-1]
2019-12-02 02:52:53 +00:00
if mnemonic in branch_likely_instructions:
target = hex(int(target, 16) - 4)[2:]
branch_targets.append(target)
else:
branch_targets.append(None)
2020-06-02 16:44:34 +00:00
if args.stop_jrra and mnemonic == "jr" and row_parts[1].strip() == "ra":
2019-12-02 02:52:53 +00:00
break
# Cleanup whitespace
originals = [original.strip() for original in originals]
2020-06-02 16:44:34 +00:00
originals = [
"".join(f"{o:<8s}" for o in original.split("\t")) for original in originals
]
2019-12-02 02:52:53 +00:00
# return diff_rows, diff_rows, line_nums
return mnemonics, diff_rows, originals, line_nums, branch_targets
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
def format_single_line_diff(line1, line2, column_width):
return f"{ansi_ljust(line1,column_width)}{ansi_ljust(line2,column_width)}"
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
class SymbolColorer:
def __init__(self, base_index):
self.color_index = base_index
self.symbol_colors = {}
def color_symbol(self, s, t=None):
try:
color = self.symbol_colors[s]
except:
color = COLOR_ROTATION[self.color_index % len(COLOR_ROTATION)]
self.color_index += 1
self.symbol_colors[s] = color
t = t or s
2020-06-02 16:44:34 +00:00
return f"{color}{t}{Fore.RESET}"
2019-12-02 02:52:53 +00:00
2020-06-18 02:14:59 +00:00
def maybe_normalize_large_imms(row):
2019-12-02 02:52:53 +00:00
if args.ignore_large_imms:
2020-06-02 16:44:34 +00:00
row = re.sub(re_large_imm, "<imm>", row)
2019-12-02 02:52:53 +00:00
return row
2020-06-02 16:44:34 +00:00
2020-06-18 02:14:59 +00:00
def normalize_imms(row):
return re.sub(re_imm, "<imm>", row)
def normalize_stack(row):
return re.sub(re_sprel, ",addr(sp)", row)
def split_off_branch(line):
parts = line.split(",")
if len(parts) < 2:
parts = line.split(None, 1)
off = len(line) - len(parts[-1])
return line[:off], line[off:]
def color_imms(out1, out2):
g1 = []
g2 = []
re.sub(re_imm, lambda s: g1.append(s.group()), out1)
re.sub(re_imm, lambda s: g2.append(s.group()), out2)
if len(g1) == len(g2):
diffs = [x != y for (x, y) in zip(g1, g2)]
it = iter(diffs)
def maybe_color(s):
return f"{Fore.LIGHTBLUE_EX}{s}{Style.RESET_ALL}" if next(it) else s
out1 = re.sub(re_imm, lambda s: maybe_color(s.group()), out1)
it = iter(diffs)
out2 = re.sub(re_imm, lambda s: maybe_color(s.group()), out2)
return out1, out2
def color_branch_imms(br1, br2):
if br1 != br2:
br1 = f"{Fore.LIGHTBLUE_EX}{br1}{Style.RESET_ALL}"
br2 = f"{Fore.LIGHTBLUE_EX}{br2}{Style.RESET_ALL}"
return br1, br2
def diff_sequences_difflib(seq1, seq2):
differ = difflib.SequenceMatcher(a=seq1, b=seq2, autojunk=False)
return differ.get_opcodes()
def diff_sequences(seq1, seq2):
if (
args.algorithm != "levenshtein"
or len(seq1) * len(seq2) > 4 * 10 ** 8
or len(seq1) + len(seq2) >= 0x110000
):
return diff_sequences_difflib(seq1, seq2)
# The Levenshtein library assumes that we compare strings, not lists. Convert.
# (Per the check above we know we have fewer than 0x110000 unique elements, so chr() works.)
remapping = {}
def remap(seq):
seq = seq[:]
for i in range(len(seq)):
val = remapping.get(seq[i])
if val is None:
val = chr(len(remapping))
remapping[seq[i]] = val
seq[i] = val
return "".join(seq)
seq1 = remap(seq1)
seq2 = remap(seq2)
return Levenshtein.opcodes(seq1, seq2)
2019-12-02 02:52:53 +00:00
def do_diff(basedump, mydump):
2020-06-02 16:44:34 +00:00
asm_lines1 = basedump.split("\n")
asm_lines2 = mydump.split("\n")
2019-12-02 02:52:53 +00:00
output = []
# TODO: status line?
# output.append(sha1sum(mydump))
2020-06-02 16:44:34 +00:00
mnemonics1, asm_lines1, originals1, line_nums1, branch_targets1 = process(
asm_lines1
)
mnemonics2, asm_lines2, originals2, line_nums2, branch_targets2 = process(
asm_lines2
)
2019-12-02 02:52:53 +00:00
sc1 = SymbolColorer(0)
sc2 = SymbolColorer(0)
sc3 = SymbolColorer(4)
sc4 = SymbolColorer(4)
sc5 = SymbolColorer(0)
sc6 = SymbolColorer(0)
bts1 = set()
bts2 = set()
if args.show_branches:
2020-06-02 16:44:34 +00:00
for (bts, btset, sc) in [
(branch_targets1, bts1, sc5),
(branch_targets2, bts2, sc6),
]:
2019-12-02 02:52:53 +00:00
for bt in bts:
if bt is not None:
btset.add(bt + ":")
sc.color_symbol(bt + ":")
2020-06-18 02:14:59 +00:00
for (tag, i1, i2, j1, j2) in diff_sequences(mnemonics1, mnemonics2):
2019-12-02 02:52:53 +00:00
lines1 = asm_lines1[i1:i2]
lines2 = asm_lines2[j1:j2]
for k, (line1, line2) in enumerate(itertools.zip_longest(lines1, lines2)):
2020-06-02 16:44:34 +00:00
if tag == "replace":
2019-12-02 02:52:53 +00:00
if line1 is None:
2020-06-02 16:44:34 +00:00
tag = "insert"
2019-12-02 02:52:53 +00:00
elif line2 is None:
2020-06-02 16:44:34 +00:00
tag = "delete"
2019-12-02 02:52:53 +00:00
try:
2020-06-02 16:44:34 +00:00
original1 = originals1[i1 + k]
line_num1 = line_nums1[i1 + k]
2019-12-02 02:52:53 +00:00
except:
2020-06-02 16:44:34 +00:00
original1 = ""
line_num1 = ""
2019-12-02 02:52:53 +00:00
try:
2020-06-02 16:44:34 +00:00
original2 = originals2[j1 + k]
line_num2 = line_nums2[j1 + k]
2019-12-02 02:52:53 +00:00
except:
2020-06-02 16:44:34 +00:00
original2 = ""
line_num2 = ""
2019-12-02 02:52:53 +00:00
2020-06-18 02:14:59 +00:00
has1 = has2 = True
line_color1 = line_color2 = sym_color = Fore.RESET
2020-06-02 16:44:34 +00:00
line_prefix = " "
2019-12-02 02:52:53 +00:00
if line1 == line2:
2020-06-18 02:14:59 +00:00
if not line1:
has1 = has2 = False
if maybe_normalize_large_imms(original1) == maybe_normalize_large_imms(
original2
):
out1 = original1
out2 = original2
2020-06-02 16:44:34 +00:00
elif line1 == "<delay-slot>":
out1 = f"{Style.DIM}{original1}"
out2 = f"{Style.DIM}{original2}"
2019-12-02 02:52:53 +00:00
else:
2020-06-18 02:14:59 +00:00
mnemonic = original1.split()[0]
out1, out2 = original1, original2
branch1 = branch2 = ""
if mnemonic in jump_instructions:
out1, branch1 = split_off_branch(original1)
out2, branch2 = split_off_branch(original2)
branchless1 = out1
branchless2 = out2
out1, out2 = color_imms(out1, out2)
branch1, branch2 = color_branch_imms(branch1, branch2)
out1 += branch1
out2 += branch2
if normalize_imms(branchless1) == normalize_imms(branchless2):
# only imms differences
sym_color = Fore.LIGHTBLUE_EX
line_prefix = "i"
else:
out1 = re.sub(
re_sprel,
lambda s: "," + sc3.color_symbol(s.group()[1:]),
out1,
)
out2 = re.sub(
re_sprel,
lambda s: "," + sc4.color_symbol(s.group()[1:]),
out2,
)
if normalize_stack(branchless1) == normalize_stack(branchless2):
# only stack differences (luckily stack and imm
# differences can't be combined in MIPS, so we
# don't have to think about that case)
sym_color = Fore.YELLOW
line_prefix = "s"
else:
# regs differences and maybe imms as well
out1 = re.sub(
re_regs, lambda s: sc1.color_symbol(s.group()), out1
)
out2 = re.sub(
re_regs, lambda s: sc2.color_symbol(s.group()), out2
)
line_color1 = line_color2 = sym_color = Fore.YELLOW
line_prefix = "r"
2020-06-02 16:44:34 +00:00
elif tag in ["replace", "equal"]:
line_prefix = "|"
2020-06-18 02:14:59 +00:00
line_color1 = Fore.LIGHTBLUE_EX
line_color2 = Fore.LIGHTBLUE_EX
sym_color = Fore.LIGHTBLUE_EX
out1 = original1
out2 = original2
2020-06-02 16:44:34 +00:00
elif tag == "delete":
line_prefix = "<"
2020-06-18 02:14:59 +00:00
line_color1 = line_color2 = sym_color = Fore.RED
has2 = False
out1 = original1
2020-06-02 16:44:34 +00:00
out2 = ""
elif tag == "insert":
line_prefix = ">"
2020-06-18 02:14:59 +00:00
line_color1 = line_color2 = sym_color = Fore.GREEN
has1 = False
2020-06-02 16:44:34 +00:00
out1 = ""
2020-06-18 02:14:59 +00:00
out2 = original2
2019-12-02 02:52:53 +00:00
2020-06-02 16:44:34 +00:00
in_arrow1 = " "
in_arrow2 = " "
out_arrow1 = ""
out_arrow2 = ""
2020-06-18 02:14:59 +00:00
line_num1 = line_num1 if has1 else ""
line_num2 = line_num2 if has2 else ""
if sym_color == line_color2:
line_color2 = ""
2019-12-02 02:52:53 +00:00
2020-06-18 02:14:59 +00:00
if args.show_branches and has1:
2019-12-02 02:52:53 +00:00
if line_num1 in bts1:
2020-06-18 02:14:59 +00:00
in_arrow1 = sc5.color_symbol(line_num1, "~>") + line_color1
2020-06-02 16:44:34 +00:00
if branch_targets1[i1 + k] is not None:
out_arrow1 = " " + sc5.color_symbol(
branch_targets1[i1 + k] + ":", "~>"
)
2020-06-18 02:14:59 +00:00
if args.show_branches and has2:
2019-12-02 02:52:53 +00:00
if line_num2 in bts2:
2020-06-18 02:14:59 +00:00
in_arrow2 = sc6.color_symbol(line_num2, "~>") + line_color2
2020-06-02 16:44:34 +00:00
if branch_targets2[j1 + k] is not None:
out_arrow2 = " " + sc6.color_symbol(
branch_targets2[j1 + k] + ":", "~>"
)
2019-12-02 02:52:53 +00:00
2020-06-18 02:14:59 +00:00
out1 = f"{line_color1}{line_num1} {in_arrow1} {out1}{Style.RESET_ALL}{out_arrow1}"
out2 = f"{line_color2}{line_num2} {in_arrow2} {out2}{Style.RESET_ALL}{out_arrow2}"
mid = f"{sym_color}{line_prefix} "
output.append(format_single_line_diff(out1, mid + out2, args.column_width))
2019-12-02 02:52:53 +00:00
2020-06-02 16:44:34 +00:00
return output[args.skip_lines :]
2019-12-02 02:52:53 +00:00
def debounced_fs_watch(targets, outq, debounce_delay):
import watchdog.events
import watchdog.observers
class WatchEventHandler(watchdog.events.FileSystemEventHandler):
def __init__(self, queue, file_targets):
self.queue = queue
self.file_targets = file_targets
def on_modified(self, ev):
if isinstance(ev, watchdog.events.FileModifiedEvent):
self.changed(ev.src_path)
def on_moved(self, ev):
if isinstance(ev, watchdog.events.FileMovedEvent):
self.changed(ev.dest_path)
def should_notify(self, path):
for target in self.file_targets:
if path == target:
return True
2020-06-02 16:44:34 +00:00
if args.make and any(
path.endswith(suffix) for suffix in FS_WATCH_EXTENSIONS
):
2019-12-02 02:52:53 +00:00
return True
return False
def changed(self, path):
if self.should_notify(path):
self.queue.put(time.time())
def debounce_thread():
listenq = queue.Queue()
file_targets = []
event_handler = WatchEventHandler(listenq, file_targets)
observer = watchdog.observers.Observer()
observed = set()
for target in targets:
if os.path.isdir(target):
observer.schedule(event_handler, target, recursive=True)
else:
file_targets.append(target)
2020-06-18 02:14:59 +00:00
target = os.path.dirname(target) or "."
2019-12-02 02:52:53 +00:00
if target not in observed:
observed.add(target)
observer.schedule(event_handler, target)
observer.start()
while True:
t = listenq.get()
more = True
while more:
delay = t + debounce_delay - time.time()
if delay > 0:
time.sleep(delay)
# consume entire queue
more = False
try:
while True:
t = listenq.get(block=False)
more = True
except queue.Empty:
pass
outq.put(t)
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
th = threading.Thread(target=debounce_thread, daemon=True)
th.start()
2020-06-02 16:44:34 +00:00
class Display:
2019-12-02 02:52:53 +00:00
def __init__(self, basedump, mydump):
self.basedump = basedump
self.mydump = mydump
self.emsg = None
def run_less(self):
if self.emsg is not None:
output = self.emsg
else:
2020-06-02 16:44:34 +00:00
output = "\n".join(do_diff(self.basedump, self.mydump))
2019-12-02 02:52:53 +00:00
# Pipe the output through 'tail' and only then to less, to ensure the
# write call doesn't block. ('tail' has to buffer all its input before
# it starts writing.) This also means we don't have to deal with pipe
# closure errors.
2020-06-02 16:44:34 +00:00
buffer_proc = subprocess.Popen(
BUFFER_CMD, stdin=subprocess.PIPE, stdout=subprocess.PIPE
)
2019-12-02 02:52:53 +00:00
less_proc = subprocess.Popen(LESS_CMD, stdin=buffer_proc.stdout)
buffer_proc.stdin.write(output.encode())
buffer_proc.stdin.close()
buffer_proc.stdout.close()
return (buffer_proc, less_proc)
def run_sync(self):
proca, procb = self.run_less()
procb.wait()
proca.wait()
def run_async(self, watch_queue):
self.watch_queue = watch_queue
self.ready_queue = queue.Queue()
self.pending_update = None
dthread = threading.Thread(target=self.display_thread)
dthread.start()
self.ready_queue.get()
def display_thread(self):
proca, procb = self.run_less()
self.less_proc = procb
self.ready_queue.put(0)
while True:
ret = procb.wait()
proca.wait()
self.less_proc = None
if ret != 0:
# fix the terminal
os.system("tput reset")
if ret != 0 and self.pending_update is not None:
# killed by program with the intent to refresh
msg, error = self.pending_update
self.pending_update = None
if not error:
self.mydump = msg
self.emsg = None
else:
self.emsg = msg
proca, procb = self.run_less()
self.less_proc = procb
self.ready_queue.put(0)
else:
# terminated by user, or killed
self.watch_queue.put(None)
self.ready_queue.put(0)
break
def progress(self, msg):
# Write message to top-left corner
sys.stdout.write("\x1b7\x1b[1;1f{}\x1b8".format(msg + " "))
sys.stdout.flush()
def update(self, text, error):
if not error and not self.emsg and text == self.mydump:
self.progress("Unchanged. ")
return
self.pending_update = (text, error)
if not self.less_proc:
return
self.less_proc.kill()
self.ready_queue.get()
def terminate(self):
if not self.less_proc:
return
self.less_proc.kill()
self.ready_queue.get()
def main():
if args.diff_obj:
make_target, basecmd, mycmd = dump_objfile()
else:
make_target, basecmd, mycmd = dump_binary()
if args.write_asm is not None:
mydump = run_objdump(mycmd)
2020-06-18 02:14:59 +00:00
with open(args.write_asm, "w") as f:
2019-12-02 02:52:53 +00:00
f.write(mydump)
print(f"Wrote assembly to {args.write_asm}.")
sys.exit(0)
if args.base_asm is not None:
with open(args.base_asm) as f:
basedump = f.read()
else:
basedump = run_objdump(basecmd)
mydump = run_objdump(mycmd)
display = Display(basedump, mydump)
if not args.watch:
display.run_sync()
else:
if not args.make:
2020-06-02 16:44:34 +00:00
yn = input(
"Warning: watch-mode (-w) enabled without auto-make (-m). You will have to run make manually. Ok? (Y/n) "
)
if yn.lower() == "n":
2019-12-02 02:52:53 +00:00
return
if args.make:
watch_sources = None
if hasattr(diff_settings, "watch_sources_for_target"):
watch_sources = diff_settings.watch_sources_for_target(make_target)
watch_sources = watch_sources or source_directories
if not watch_sources:
fail("Missing source_directories config, don't know what to watch.")
else:
watch_sources = [make_target]
q = queue.Queue()
debounced_fs_watch(watch_sources, q, DEBOUNCE_DELAY)
display.run_async(q)
last_build = 0
try:
while True:
t = q.get()
if t is None:
break
if t < last_build:
continue
last_build = time.time()
if args.make:
display.progress("Building...")
ret = run_make(make_target, capture_output=True)
if ret.returncode != 0:
2020-06-02 16:44:34 +00:00
display.update(
2020-06-18 02:14:59 +00:00
ret.stderr.decode("utf-8-sig", "replace")
or ret.stdout.decode("utf-8-sig", "replace"),
error=True,
2020-06-02 16:44:34 +00:00
)
2019-12-02 02:52:53 +00:00
continue
mydump = run_objdump(mycmd)
display.update(mydump, error=False)
except KeyboardInterrupt:
display.terminate()
2020-06-02 16:44:34 +00:00
2019-12-02 02:52:53 +00:00
main()