6502/SixtyPical
1
0
Fork 0
mirror of https://github.com/catseye/SixtyPical.git synced 2025-02-16 15:30:26 +00:00
Code Issues Projects Releases Wiki Activity

Refs have indexes. Instructions do not.

Browse Source
This commit is contained in:
Chris Pressey 2018-03-05 12:19:27 +00:00
parent 0a83d90515
commit b579e8b2eb
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sixtypical/ast.py
View File

@ -69,7 +69,7 @@ class Instr(AST):
class SingleOp(Instr):
value_attrs = ('opcode', 'dest', 'src', 'index', 'location',)
value_attrs = ('opcode', 'dest', 'src', 'location',)
class BlockOp(Instr):

28
src/sixtypical/parser.py
View File

@ -317,13 +317,16 @@ class Parser(object):
loc = self.locexpr()
return AddressRef(loc)
else:
loc = self.locexpr(forward=forward)
if not isinstance(loc, basestring):
index = None
if self.scanner.consume('+'):
index = self.locexpr()
loc = IndexedRef(loc, index)
return loc
return self.indexed_locexpr(forward=forward)
def indexed_locexpr(self, forward=False):
loc = self.locexpr(forward=forward)
if not isinstance(loc, basestring):
index = None
if self.scanner.consume('+'):
index = self.locexpr()
loc = IndexedRef(loc, index)
return loc
def statics(self):
defns = []
@ -371,24 +374,21 @@ class Parser(object):
dest = self.locexpr()
self.scanner.expect(',')
src = self.indlocexpr()
return SingleOp(opcode=opcode, dest=dest, src=src, index=None)
return SingleOp(opcode=opcode, dest=dest, src=src)
elif self.scanner.token in ("add", "sub", "cmp", "and", "or", "xor"):
opcode = self.scanner.token
self.scanner.scan()
dest = self.locexpr()
self.scanner.expect(',')
src = self.locexpr()
index = None
if self.scanner.consume('+'):
index = self.locexpr()
return SingleOp(opcode=opcode, dest=dest, src=src, index=index)
src = self.indexed_locexpr()
return SingleOp(opcode=opcode, dest=dest, src=src)
elif self.scanner.token in ("st",):
opcode = self.scanner.token
self.scanner.scan()
src = self.locexpr()
self.scanner.expect(',')
dest = self.indlocexpr()
return SingleOp(opcode=opcode, dest=dest, src=src, index=None)
return SingleOp(opcode=opcode, dest=dest, src=src)
elif self.scanner.token in ("shl", "shr", "inc", "dec"):
opcode = self.scanner.token
self.scanner.scan()