guru
/
dcpu16
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Assembler: remove restrictions on some operands

This commit is contained in:
Maurizio Porrato 2021-02-13 15:40:29 +00:00
parent c6b820cc8b
commit b9c432a9b4
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
asm.py
View File

@ -87,10 +87,7 @@ class ASM(SimpleNamespace):
else:
return (0x1a, arg.disp)
else:
if (sp, is_a) not in (('inc', True), ('dec', False)):
raise SyntaxError()
else:
return (0x18, None)
return (0x18, None)
elif arg.reg in ('PC', 'EX'):
raise SyntaxError()
else:
@ -270,8 +267,8 @@ def exprlist_expr(p):
def arg_a_arg(p):
return p[0]
@pg.production("arg_a : POP")
def arg_a_pop(p):
@pg.production("arg : POP")
def arg_pop(p):
return Indirect(reg='SP', disp=0, sp='inc')
@pg.production("arg_a : SBO REG ADD ADD SBC")
@ -284,12 +281,12 @@ def arg_a_pop_explicit(p):
def arg_b_arg(p):
return p[0]
@pg.production("arg_b : PUSH")
def arg_b_push(p):
@pg.production("arg : PUSH")
def arg_push(p):
return Indirect(reg='SP', disp=0, sp='dec')
@pg.production("arg_b : SBO SUBTRACT SUBTRACT REG SBC")
def arg_b_push_explicit(p):
@pg.production("arg : SBO SUBTRACT SUBTRACT REG SBC")
def arg_push_explicit(p):
if p[3].getstr().upper() != 'SP':
raise SyntaxError()
return Indirect(reg='SP', disp=0, sp='dec')