6502/SixtyPical
1
0
Fork 0
mirror of https://github.com/catseye/SixtyPical.git synced 2024-11-22 17:32:01 +00:00
Code Issues Projects Releases Wiki Activity

Copy indexed location to location. All tests pass again.

Browse Source
This commit is contained in:
Chris Pressey 2017-12-08 15:07:15 +00:00
parent 689ed37f2e
commit aa5e4119da
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sixtypical/analyzer.py
View File

@ -355,6 +355,12 @@ class Analyzer(object):
else: else:
raise TypeMismatchError((src, dest)) raise TypeMismatchError((src, dest))
elif isinstance(src, IndexedRef) and isinstance(dest, LocationRef):
if src.ref.type == TYPE_WORD_TABLE and dest.type == TYPE_WORD:
pass
else:
raise TypeMismatchError((src, dest))
elif isinstance(src, (LocationRef, ConstantRef)) and isinstance(dest, LocationRef): elif isinstance(src, (LocationRef, ConstantRef)) and isinstance(dest, LocationRef):
if src.type == dest.type: if src.type == dest.type:
pass pass
@ -382,7 +388,15 @@ class Analyzer(object):
elif isinstance(src, IndirectRef) and isinstance(dest, LocationRef): elif isinstance(src, IndirectRef) and isinstance(dest, LocationRef):
context.assert_meaningful(src.ref, REG_Y) context.assert_meaningful(src.ref, REG_Y)
# TODO this will need to be more sophisticated. the thing ref points to is touched, as well. # TODO this will need to be more sophisticated. the thing ref points to is touched, as well.
context.set_touched(src.ref) context.set_touched(src.ref) # TODO and REG_Y? if not, why not?
context.set_written(dest)
elif isinstance(src, LocationRef) and isinstance(dest, IndexedRef):
context.assert_meaningful(src, dest.ref, dest.index)
context.set_touched(src) # TODO and dest.index?
context.set_written(dest.ref)
elif isinstance(src, IndexedRef) and isinstance(dest, LocationRef):
context.assert_meaningful(src.ref, src.index, dest)
context.set_touched(dest) # TODO and src.index?
context.set_written(dest) context.set_written(dest)
else: else:
context.assert_meaningful(src) context.assert_meaningful(src)