Skip to content

perf(assembler): 1.5x faster parse_asm -- 33% less assemble time #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dexhunter wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −4
Open

perf(assembler): 1.5x faster parse_asm -- 33% less assemble time #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/tiny8/assembler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ def parse_asm(text: str) -> AsmResult:
pc = 0
lines = text.splitlines()
result.source_lines = lines.copy()
reg_map = {"X": 26, "Y": 28, "Z": 30}
disp_sub = re.compile(r"([XYZxyz]|r\d+|R\d+)\s*\+\s*(\w+)").sub

for line_num, raw_line in enumerate(lines):
line = raw_line.split(";", 1)[0].strip()
Expand All @@ -76,20 +78,19 @@ def parse_asm(text: str) -> AsmResult:
if not line:
continue

line = re.sub(r"([XYZxyz]|r\d+|R\d+)\s*\+\s*(\w+)", r"\1+\2", line)
if "+" in line:
line = disp_sub(r"\1+\2", line)
parts = line.replace(",", " ").split()
instr = parts[0].upper()
ops = []
for p in parts[1:]:
if (p[0] == "r" or p[0] == "R") and len(p) > 1 and p[1:].isdigit():
ops.append(("reg", int(p[1:])))
elif p.upper() in ("X", "Y", "Z"):
reg_map = {"X": 26, "Y": 28, "Z": 30}
elif p.upper() in reg_map:
ops.append(("reg", reg_map[p.upper()]))
elif "+" in p:
base, disp = p.split("+", 1)
base_u = base.upper()
reg_map = {"X": 26, "Y": 28, "Z": 30}
if base_u in reg_map:
base_reg = reg_map[base_u]
elif base_u.startswith("R") and base_u[1:].isdigit():
Expand Down
Loading