6502/Ophis
1
0
Fork 0
mirror of https://github.com/michaelcmartin/Ophis.git synced 2024-06-09 10:29:28 +00:00
Code Issues Projects Releases Wiki Activity

Update listing to include source file, line number, and source line

Browse Source
This commit is contained in:
Garrett Nievin 2020-03-22 18:23:17 -04:00
parent 99f074da27
commit 026df20726
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Ophis/Listing.py
View File

@ -37,6 +37,10 @@ class Listing(object):
self.listing[-1][1].extend(vals)
def dump(self):
openfiles = []
filelines = {}
prevline = None
prevfile = None
if self.filename == "-":
out = sys.stdout
else:
@ -44,6 +48,28 @@ class Listing(object):
for x in self.listing:
if type(x) is str:
print(x, file=out)
elif type(x) is list:
curline = x[0].split('->')[0]
curfile, curln = curline.split(':')
curln = int(curln)
if not curfile in openfiles:
openfiles.append(curfile)
with open(curfile, 'rt') as f:
filelines['curfile'] = f.read().splitlines()
#print("=== %s" % curfile)
#lnum = 0
#for fileline in filelines['curfile']:
# lnum += 1
# print("%4d %s" % (lnum, fileline))
if not prevfile == curfile:
prevfile = curfile
print("Source file: %s" % curfile, file=out)
srcline = filelines['curfile'][curln - 1]
if prevline == curline:
print("%-32s" % (x[1]), file=out)
else:
prevline = curline
print("%-32s %5d %s" % (x[1], curln, srcline.strip()), file=out)
elif type(x) is tuple:
i = 0
pc = x[0]

4
src/Ophis/Passes.py
View File

@ -929,10 +929,10 @@ class Assembler(Pass):
self.outputbyte(expr, env, inst_bytes)
elif arglen == 2:
self.outputword(expr, env, inst_bytes)
self.listing.listInstruction(self.listing_string(env.getPC(),
self.listing.listInstruction([node.ppt, self.listing_string(env.getPC(),
inst_bytes,
mode, opcode,
val1, val2))
val1, val2)])
env.incPC(1 + arglen)
self.code += 1 + arglen