GabrielTofvesson/Microcode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better error messages.

Browse Source
This commit is contained in:
Edvard Thörnros 2019-04-02 13:36:21 +02:00
parent 967aca42c7
commit abb8aa8dc9
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
compiler.py
View File

@ -178,6 +178,12 @@ if not output_file:
output_file = stdout output_file = stdout
def parse_number(string): def parse_number(string):
"""
Parse the string as a number.
Accepts hexadecimal, decimal, binary and taggs, which
are later parsed to a number when all tags are known.
"""
if string[0] == "@": if string[0] == "@":
return string[1:] # It will be a number... return string[1:] # It will be a number...
try: try:
@ -190,6 +196,9 @@ def parse_number(string):
raise SyntaxError("{} is not a valid number.".format(string)) raise SyntaxError("{} is not a valid number.".format(string))
def parse_operand(operand): def parse_operand(operand):
"""
Parse out the argument of the operation.
"""
if operand[0] == '*': if operand[0] == '*':
if operand[1] == '*': if operand[1] == '*':
n = parse_number(operand[2:]) n = parse_number(operand[2:])
@ -198,22 +207,29 @@ def parse_operand(operand):
n = parse_number(operand[1:]) n = parse_number(operand[1:])
mode = ADDRESS_MODES["DIRECT"] mode = ADDRESS_MODES["DIRECT"]
if type(n) == str or (n & 0xFF) == n: if type(n) == str or (n & 0xFF) == n:
return True, n, mode return n, mode
raise SyntaxError("{} does not fit in 16 bits.".format(n)) raise SyntaxError("{} does not fit in 16 bits.".format(n))
if operand[0] == '[' and operand[-1] == ']': if operand[0] == '[' and operand[-1] == ']':
return True, parse_number(operand[1:-1]), ADDRESS_MODES["INDEXED"] return parse_number(operand[1:-1]), ADDRESS_MODES["INDEXED"]
n = parse_number(operand) n = parse_number(operand)
if type(n) == str or (n & 0xFFFF) == n: if type(n) == str or (n & 0xFFFF) == n:
return True, n, ADDRESS_MODES["IMMEDIATE"] return n, ADDRESS_MODES["IMMEDIATE"]
raise SyntaxError("{} does not fit in 32 bits.".format(n)) raise SyntaxError("{} does not fit in 32 bits.".format(n))
def parse_instruction(args): def parse_instruction(args):
"""
Parse an assembly instruction into an instruction object.
"""
if len(args) < 3:
raise SyntaxError("Not enough arguments.")
if len(args) > 3:
raise SyntaxError("Trash at end of line \"{}\"".format(" ".join(args[3:])))
opcode = OPCODE_TABLE[args[0]] opcode = OPCODE_TABLE[args[0]]
register = REGISTERS[args[1]] if args[1].upper() not in REGISTERS:
success, address, mode = parse_operand(args[2]) raise SyntaxError("Invalid register name" + args[1])
if success: register = REGISTERS[args[1].upper()]
return Instruction(opcode, register, mode, address) address, mode = parse_operand(args[2])
return False return Instruction(opcode, register, mode, address)
success = True success = True