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

Fix bug.

Browse Source
This commit is contained in:
Edvard Thörnros 2019-04-03 16:04:37 +02:00
parent 89cb4d2197
commit b9b8c17abd
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler.py
View File

@ -125,7 +125,7 @@ OPCODE_TABLE = {
"LSR" : 0b0101, "LSR" : 0b0101,
"BRA" : 0b0110, "BRA" : 0b0110,
"BNE" : 0b0111, "BNE" : 0b0111,
"NOP" : 0b0000, "HALT" : 0b1111,
} }
ADDRESS_MODES = { ADDRESS_MODES = {
@ -144,9 +144,9 @@ REGISTERS = {
WORD_SIZE = 16 WORD_SIZE = 16
output_format = "hex"
input_file = False input_file = False
output_file = False output_file = False
output_format = "hex"
newlines = True newlines = True
# #
@ -182,6 +182,10 @@ if not input_file:
if not output_file: if not output_file:
output_file = stdout output_file = stdout
#
# Parser
#
def parse_number(string): def parse_number(string):
""" """
Parse the string as a number. Parse the string as a number.
@ -244,6 +248,7 @@ def main():
instructions = [] instructions = []
tag_table = {} tag_table = {}
# Parse
for line in input_file: for line in input_file:
line_number += 1 line_number += 1
if "#" in line: if "#" in line:
@ -277,6 +282,7 @@ def main():
print("ERROR:{} Unknown symbol \"{}\"".format(line_number, line)) print("ERROR:{} Unknown symbol \"{}\"".format(line_number, line))
success = False success = False
# Link instructions
for instruction in instructions: for instruction in instructions:
try: try:
if type(instruction) == Instruction: if type(instruction) == Instruction:
@ -285,9 +291,11 @@ def main():
print("LINKING ERROR: {}".format(e)) print("LINKING ERROR: {}".format(e))
success = False success = False
# Exit on error
if not success: if not success:
return 1 return 1
# Write out the program
def print_as_hex(out, inst, newlines): def print_as_hex(out, inst, newlines):
string = instruction.to_hex() string = instruction.to_hex()
if newlines: if newlines:
@ -316,6 +324,7 @@ def main():
output_file.flush() output_file.flush()
output_file.close() output_file.close()
return 0
if __name__ == "__main__": if __name__ == "__main__":