mirror of
https://github.com/zeldaret/mm.git
synced 2026-07-07 04:54:55 -04:00
Convert every submodule into subrepo (#170)
* remove ZAPD submodule * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "ca229f19" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "ca229f19" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone https://github.com/simonlindholm/decomp-permuter.git tools/decomp-permuter subrepo: subdir: "tools/decomp-permuter" merged: "1e4b85a7" upstream: origin: "https://github.com/simonlindholm/decomp-permuter.git" branch: "main" commit: "1e4b85a7" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Remove asm-differ * git subrepo clone https://github.com/simonlindholm/asm-differ.git tools/asm-differ subrepo: subdir: "tools/asm-differ" merged: "eaf72269" upstream: origin: "https://github.com/simonlindholm/asm-differ.git" branch: "master" commit: "eaf72269" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * remove asm-processor * git subrepo clone https://github.com/simonlindholm/asm-processor.git tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "85288fcd" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "85288fcd" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * remove .gitmodules file * Update REAMDE * Update warnings
This commit is contained in:
Submodule tools/asm-differ deleted from 9d79eb9f53
@@ -0,0 +1,2 @@
|
||||
.mypy_cache/
|
||||
__pycache__/
|
||||
@@ -0,0 +1,12 @@
|
||||
; DO NOT EDIT (unless you know what you are doing)
|
||||
;
|
||||
; This subdirectory is a git "subrepo", and this file is maintained by the
|
||||
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
|
||||
;
|
||||
[subrepo]
|
||||
remote = https://github.com/simonlindholm/asm-differ.git
|
||||
branch = master
|
||||
commit = eaf72269cf7329bc061e50d8788229575f656f06
|
||||
parent = fa02cf86ffdb88253181cda15d047b08576d3f99
|
||||
method = merge
|
||||
cmdver = 0.4.3
|
||||
@@ -0,0 +1,40 @@
|
||||
# asm-differ
|
||||
|
||||
Nice differ for assembly code (MIPS and AArch64; should be easy to hack to support other instruction sets).
|
||||
|
||||

|
||||
|
||||
## Dependencies
|
||||
|
||||
- Python >= 3.6
|
||||
- `python3 -m pip install --user colorama ansiwrap watchdog python-Levenshtein`
|
||||
|
||||
## Usage
|
||||
|
||||
Create a file `diff-settings.sh` in some directory (see the one in this repo for an example). Then from that directory, run
|
||||
|
||||
```
|
||||
/path/to/diff.sh [flags] (function|rom addr)
|
||||
```
|
||||
|
||||
Recommended flags are `-mwo` (automatically run `make` on source file changes, and include symbols in diff). See `--help` for more details.
|
||||
|
||||
### Tab completion
|
||||
|
||||
[argcomplete](https://kislyuk.github.io/argcomplete/) can be optionally installed (with `python3 -m pip install argcomplete`) to enable tab completion in a bash shell, completing options and symbol names using the linker map. It also requires a bit more setup:
|
||||
|
||||
If invoking the script **exactly** as `./diff.py`, the following should be added to the `.bashrc` according to argcomplete's instructions:
|
||||
|
||||
```sh
|
||||
eval "$(register-python-argcomplete ./diff.py)"
|
||||
```
|
||||
|
||||
If that doesn't work, run `register-python-argcomplete ./diff.py` in your terminal and copy the output to `.bashrc`.
|
||||
|
||||
If setup correctly (don't forget to restart the shell), `complete | grep ./diff.py` should output:
|
||||
|
||||
```
|
||||
complete -o bashdefault -o default -o nospace -F _python_argcomplete ./diff.py
|
||||
```
|
||||
|
||||
Note for developers or for general troubleshooting: run `export _ARC_DEBUG=` to enable debug output during tab-completion, it may show otherwise silenced errors. Use `unset _ARC_DEBUG` or restart the terminal to disable.
|
||||
Executable
+1607
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,10 @@
|
||||
def apply(config, args):
|
||||
config["baseimg"] = "target.bin"
|
||||
config["myimg"] = "source.bin"
|
||||
config["mapfile"] = "build.map"
|
||||
config["source_directories"] = ["."]
|
||||
#config["arch"] = "mips"
|
||||
#config["map_format"] = "gnu" # gnu or mw
|
||||
#config["mw_build_dir"] = "build/" # only needed for mw map format
|
||||
#config["makeflags"] = []
|
||||
#config["objdump_executable"] = ""
|
||||
@@ -0,0 +1,16 @@
|
||||
[mypy]
|
||||
check_untyped_defs = True
|
||||
disallow_any_generics = True
|
||||
disallow_incomplete_defs = True
|
||||
disallow_subclassing_any = True
|
||||
disallow_untyped_calls = True
|
||||
disallow_untyped_decorators = True
|
||||
disallow_untyped_defs = True
|
||||
no_implicit_optional = True
|
||||
warn_redundant_casts = True
|
||||
warn_return_any = True
|
||||
warn_unused_ignores = True
|
||||
python_version = 3.6
|
||||
|
||||
[mypy-diff_settings]
|
||||
ignore_errors = True
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 98 KiB |
Reference in New Issue
Block a user