Subrepos update (#1208)

* git subrepo pull tools/asm-differ --force

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "ae408664a"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ"
  branch:   "main"
  commit:   "ae408664a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull (merge) tools/fado --force

subrepo:
  subdir:   "tools/fado"
  merged:   "8d896ee97"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "8d896ee97"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/graphovl --force

subrepo:
  subdir:   "tools/graphovl"
  merged:   "dab4addae"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "dab4addae"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/z64compress --force

subrepo:
  subdir:   "tools/z64compress"
  merged:   "43035d97f"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "43035d97f"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "23929ec93"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "23929ec93"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Revert "git subrepo pull tools/z64compress --force"

This reverts commit 2e487b5008.

tools/asm-differ/.gitignore

@@ -1,2 +1,4 @@
 .mypy_cache/
 __pycache__/
+.vscode/
+poetry.lock

tools/asm-differ/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/simonlindholm/asm-differ
 	branch = main
-	commit = 1236288d1520335c2bfb672078fec65084d7cb5c
-	parent = 2c5690701a350c7e7c3d6252dff925ad65d59910
+	commit = ae408664a89ea4dc70d005d0afc69ac26c938cbb
+	parent = c833969ea79ba31c3103e25e94ef88098c0287de
 	method = merge
 	cmdver = 0.4.3

tools/asm-differ/.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
     - id: black

tools/asm-differ/README.md

@@ -7,7 +7,7 @@ Nice differ for assembly code. Currently supports MIPS, PPC, AArch64, and ARM32;
 ## Dependencies
 
 - Python >= 3.6
-- `python3 -m pip install --user colorama watchdog python-Levenshtein` (also `dataclasses` if on 3.6)
+- `python3 -m pip install --user colorama watchdog levenshtein cxxfilt` (also `dataclasses` if on 3.6)
 
 ## Usage
 

tools/asm-differ/diff_settings.py

@@ -5,7 +5,8 @@ def apply(config, args):
     config["source_directories"] = ["."]
     # config["show_line_numbers_default"] = True
     # config["arch"] = "mips"
-    # config["map_format"] = "gnu" # gnu or mw
-    # config["mw_build_dir"] = "build/" # only needed for mw map format
+    # config["map_format"] = "gnu" # gnu, mw, ms
+    # config["build_dir"] = "build/" # only needed for mw and ms map format
+    # config["expected_dir"] = "expected/" # needed for -o
     # config["makeflags"] = []
     # config["objdump_executable"] = ""

tools/asm-differ/pyproject.toml

@@ -0,0 +1,21 @@
+[tool.poetry]
+name = "asm-differ"
+version = "0.1.0"
+description = ""
+authors = ["Simon Lindholm <simon.lindholm10@gmail.com>"]
+license = "UNLICENSE"
+readme = "README.md"
+packages = [{ include = "diff.py" }]
+
+[tool.poetry.dependencies]
+python = "^3.7"
+colorama = "^0.4.6"
+ansiwrap = "^0.8.4"
+watchdog = "^2.2.0"
+levenshtein = "^0.20.9"
+cxxfilt = "^0.3.0"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"