aboutsummaryrefslogtreecommitdiff
path: root/z80count.py
diff options
context:
space:
mode:
authorJuan J. Martinez <jjm@usebox.net>2019-03-31 07:35:51 +0100
committerJuan J. Martinez <jjm@usebox.net>2019-03-31 07:35:51 +0100
commit2a28aca766e8dde8c6ee40ae378c1e5a60c15083 (patch)
treed07f7eaba6b936f0803f82ec90e37404ab5884ec /z80count.py
parent6f242673e24cb36fa2cdd3309407f77d29b4364e (diff)
downloadz80count-2a28aca766e8dde8c6ee40ae378c1e5a60c15083.tar.gz
z80count-2a28aca766e8dde8c6ee40ae378c1e5a60c15083.zip
Make it testeable
Diffstat (limited to 'z80count.py')
-rwxr-xr-xz80count.py92
1 files changed, 49 insertions, 43 deletions
diff --git a/z80count.py b/z80count.py
index b091725..54757d4 100755
--- a/z80count.py
+++ b/z80count.py
@@ -29,6 +29,50 @@ import re
import argparse
from os import path
+OUR_COMMENT = re.compile(r"(\[[0-9.\s/]+\])")
+
+
+def z80count(line, table, total, total_cond, subt, update, tabstop=2, debug=False):
+ out = line.rstrip() + "\n"
+ for entry in table:
+ if entry["cregex"].search(line):
+ cycles = entry["cycles"]
+ if "/" in cycles:
+ c = cycles.split("/")
+ total += int(c[1])
+ total_cond += total + int(c[0])
+ else:
+ total += int(cycles)
+ total_cond = 0
+
+ line = line.rstrip().rsplit(";", 1)
+ comment = "; [%s" % cycles
+ if subt:
+ if total_cond:
+ comment += " .. %d/%d]" % (total_cond, total)
+ else:
+ comment += " .. %d]" % total
+ else:
+ comment += "]"
+ if debug:
+ comment += " case{%s}" % entry["case"]
+
+ if len(line) == 1:
+ comment = "\t" * tabstop + comment
+ out = line[0] + comment
+ if len(line) > 1:
+ if update:
+ m = OUR_COMMENT.search(line[1])
+ if m:
+ line[1] = line[1].replace(m.group(0), "")
+ out += " "
+ out += line[1].lstrip()
+ out += "\n"
+ found = True
+ break
+
+ return (out, total, total_cond)
+
def main():
@@ -56,15 +100,14 @@ def main():
in_f = args.infile
out_f = args.outfile
- table_file = path.join(path.dirname(path.realpath(__file__)), "z80table.json")
+ table_file = path.join(
+ path.dirname(path.realpath(__file__)), "z80table.json")
with open(table_file, "rt") as fd:
table = json.load(fd)
for i in range(len(table)):
table[i]["cregex"] = re.compile(table[i]["regex"] + r"\s?(;.*)?", re.I)
- our_comment = re.compile(r"(\[[0-9.\s/]+\])")
-
table = sorted(table, key=lambda o: o["w"])
total = total_cond = 0
while True:
@@ -72,46 +115,9 @@ def main():
if not line:
break
- found = False
- for entry in table:
- if entry["cregex"].search(line):
- cycles = entry["cycles"]
- if "/" in cycles:
- c = cycles.split("/")
- total += int(c[1])
- total_cond = total + int(c[0])
- else:
- total += int(cycles)
- total_cond = 0
-
- line = line.rstrip().rsplit(";", 1)
- comment = "; [%s" % cycles
- if args.subt:
- if total_cond:
- comment += " .. %d/%d]" % (total_cond, total)
- else:
- comment += " .. %d]" % total
- else:
- comment += "]"
- if args.debug:
- comment += " case{%s}" % entry["case"]
-
- if len(line) == 1:
- comment = "\t" * args.tabstop + comment
- out_f.write(line[0] + comment)
- if len(line) > 1:
- if args.update:
- m = our_comment.search(line[1])
- if m:
- line[1] = line[1].replace(m.group(0), "")
- out_f.write(" ")
- out_f.write(line[1].lstrip())
- out_f.write("\n")
- found = True
- break
-
- if not found:
- out_f.write(line.rstrip() + "\n")
+ output, total, total_cond = z80count(
+ line, table, total, total_cond, args.subt, args.update, args.tabstop, args.debug)
+ out_f.write(output)
if __name__ == "__main__":