Compare commits
5 Commits
d72bbb9ee2
...
d8a51cc1cd
| Author | SHA1 | Date | |
|---|---|---|---|
| d8a51cc1cd | |||
| d4c2bb0dc7 | |||
| fe8276e9da | |||
| e56ff2d847 | |||
| 5962a73341 |
@ -4,12 +4,14 @@ version = "0.1.1"
|
||||
description = "Add your description here"
|
||||
readme = "README.md"
|
||||
requires-python = ">=3.11"
|
||||
dependencies = []
|
||||
dependencies = [
|
||||
"rich>=14.0.0",
|
||||
]
|
||||
|
||||
[project.scripts]
|
||||
dp32emu = "emulator.main:main"
|
||||
dp32dbg = "debugger.main:main"
|
||||
dp32emu = "main:main"
|
||||
dp32dbg = "dbg_main:main"
|
||||
|
||||
[bulild-system]
|
||||
[build-system]
|
||||
requires = ["setuptools"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
3
src/README.md
Normal file
3
src/README.md
Normal file
@ -0,0 +1,3 @@
|
||||
# почему так грязно?
|
||||
|
||||
Потому что я заколебался воевать с модульностью питона, чтобы сделать это красиво
|
||||
57
src/dbg_main.py
Normal file
57
src/dbg_main.py
Normal file
@ -0,0 +1,57 @@
|
||||
"""
|
||||
Это очень грязное решение, но из-за страданий с пакетированием всех скриптов
|
||||
оказалось тупо проще засунуть дебаггер сразу в эту папку и не мучить себя
|
||||
"""
|
||||
|
||||
from typing import cast
|
||||
from dpdebugger import Debugger, DbgDict, DbgInstrDesc
|
||||
from argparse import ArgumentParser
|
||||
import json
|
||||
import dbg_tui
|
||||
|
||||
def parse_dbg(dbg_json_dict: dict) -> DbgDict:
|
||||
"""
|
||||
При сериализации json всегда переводит ключи в формат строк и с этим
|
||||
ничего поделать нельзя. Но для работы отладчика мне нужно, чтобы
|
||||
ключами были числа, поэтому эта функция пытается привести к int
|
||||
все ключи, лежащие в "instructions"
|
||||
"""
|
||||
instrs: dict[str | str, DbgInstrDesc] = dbg_json_dict["instructions"]
|
||||
result: dict[int, DbgInstrDesc] = {
|
||||
int(k) : instrs[k] for k in instrs
|
||||
}
|
||||
dbg_copy = dbg_json_dict.copy()
|
||||
dbg_copy["instructions"] = result
|
||||
dbg_copy = cast(DbgDict, dbg_copy)
|
||||
return dbg_copy
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = ArgumentParser(
|
||||
prog="dp32dbg",
|
||||
description="Bad debugger for DP32 processor"
|
||||
)
|
||||
parser.add_argument(
|
||||
"-m",
|
||||
"--memory",
|
||||
required=True,
|
||||
help="Initial memory for virtual machine"
|
||||
)
|
||||
parser.add_argument(
|
||||
"-d",
|
||||
"--debug-file",
|
||||
required=True,
|
||||
help="JSON with debug information. by default named dbg.json"
|
||||
)
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
with open(args.memory, "rb") as f:
|
||||
mem = bytearray(f.read())
|
||||
with open(args.debug_file, 'r') as f:
|
||||
dbg_dict: DbgDict = parse_dbg(json.load(f))
|
||||
|
||||
dbg = Debugger(mem, dbg_dict)
|
||||
with open (dbg_dict["src"], 'r') as f:
|
||||
src = f.read()
|
||||
|
||||
dbg_tui.main(dbg, src)
|
||||
35
src/dbg_tui.py
Normal file
35
src/dbg_tui.py
Normal file
@ -0,0 +1,35 @@
|
||||
from dpdebugger import Debugger
|
||||
from dataclasses import dataclass
|
||||
from rich import print as rprint
|
||||
from rich.layout import Layout
|
||||
from rich.live import Live
|
||||
|
||||
@dataclass
|
||||
class SourceLines:
|
||||
active: int
|
||||
begining_number: int
|
||||
lines: list[str]
|
||||
|
||||
def _get_source_lines(
|
||||
srcline: int,
|
||||
lines: list[str],
|
||||
max_height: int
|
||||
) -> SourceLines:
|
||||
"""
|
||||
Собирает выборку из строк исходного кода так, чтобы она
|
||||
подходила по количесту строчек
|
||||
"""
|
||||
start = max(srcline - max_height//2, 1) + 1
|
||||
upper_length = srcline - start
|
||||
end =
|
||||
|
||||
|
||||
|
||||
def main(debugger: Debugger, srcfile: str):
|
||||
layout = Layout()
|
||||
layout.split_column(
|
||||
Layout(name="source"),
|
||||
Layout(name="terminal")
|
||||
)
|
||||
rprint(layout)
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
def main():
|
||||
print("Hello world!")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -2,7 +2,8 @@
|
||||
Отладчик принимает на вход довольно много всего и пытается вам
|
||||
хоть как-то помочь
|
||||
"""
|
||||
from emulator.vm import VM, VMException, Breakpoint, Condition, WORD_SIZE
|
||||
|
||||
from vm import VM, VMException, Breakpoint, Condition, WORD_SIZE
|
||||
|
||||
from dataclasses import dataclass
|
||||
from typing import TypedDict, Callable, cast
|
||||
@ -59,6 +60,7 @@ class Debugger:
|
||||
self._vm = VM(mem)
|
||||
self._dbg_dict = dbg_dict
|
||||
self._breakpoints = set()
|
||||
self.__init_callbacks__()
|
||||
|
||||
def __init_callbacks__(self):
|
||||
self._callbacks_table = {
|
||||
51
uv.lock
generated
51
uv.lock
generated
@ -5,4 +5,53 @@ requires-python = ">=3.11"
|
||||
[[package]]
|
||||
name = "dp32-proto"
|
||||
version = "0.1.1"
|
||||
source = { virtual = "." }
|
||||
source = { editable = "." }
|
||||
dependencies = [
|
||||
{ name = "rich" },
|
||||
]
|
||||
|
||||
[package.metadata]
|
||||
requires-dist = [{ name = "rich", specifier = ">=14.0.0" }]
|
||||
|
||||
[[package]]
|
||||
name = "markdown-it-py"
|
||||
version = "3.0.0"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
dependencies = [
|
||||
{ name = "mdurl" },
|
||||
]
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/38/71/3b932df36c1a044d397a1f92d1cf91ee0a503d91e470cbd670aa66b07ed0/markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb", size = 74596 }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1", size = 87528 },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mdurl"
|
||||
version = "0.1.2"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729 }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979 },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pygments"
|
||||
version = "2.19.1"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/7c/2d/c3338d48ea6cc0feb8446d8e6937e1408088a72a39937982cc6111d17f84/pygments-2.19.1.tar.gz", hash = "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f", size = 4968581 }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/8a/0b/9fcc47d19c48b59121088dd6da2488a49d5f72dacf8262e2790a1d2c7d15/pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c", size = 1225293 },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rich"
|
||||
version = "14.0.0"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
dependencies = [
|
||||
{ name = "markdown-it-py" },
|
||||
{ name = "pygments" },
|
||||
]
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/a1/53/830aa4c3066a8ab0ae9a9955976fb770fe9c6102117c8ec4ab3ea62d89e8/rich-14.0.0.tar.gz", hash = "sha256:82f1bc23a6a21ebca4ae0c45af9bdbc492ed20231dcb63f297d6d1021a9d5725", size = 224078 }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/0d/9b/63f4c7ebc259242c89b3acafdb37b41d1185c07ff0011164674e9076b491/rich-14.0.0-py3-none-any.whl", hash = "sha256:1c9491e1951aac09caffd42f448ee3d04e58923ffe14993f6e83068dc395d7e0", size = 243229 },
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user