BCI/BCI-dev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed the assembler's bindump function

Browse Source
This commit is contained in:
Daniel Knüttel 2018-10-27 16:51:30 +02:00
parent 8fbff510cc
commit ad7c3ab09f
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assembler/assembler/assembler.py
View File

@ -3,7 +3,7 @@ from collections import deque
from .context import FileContext from .context import FileContext
from .tokenize import Tokenizer, WHITESPACE from .tokenize import Tokenizer, WHITESPACE
from .opcodes import make_opcodes from .opcodes import make_opcodes
from .util import can_be_mark, can_convert_to_int, autoint from .util import can_be_mark, can_convert_to_int, autoint, int16_2_bytes
from .directives import SetDirective from .directives import SetDirective
class ParsingError(Exception): class ParsingError(Exception):
@ -92,7 +92,14 @@ class Assembler(object):
# FIXME: # FIXME:
# Make this work for tons of data. # Make this work for tons of data.
# Or is that necessary? # Or is that necessary?
return file_.write(bytes(self._code_objects)) # TODO:
# Figure out whether/what improovements are necessary here
length = int16_2_bytes(len(self._code_objects))
if(len(self._code_objects).bit_length() > 16):
raise ValueError("Program size excceeds 2^16.")
file_.write(length)
for word in self._code_objects:
file_.write(int16_2_bytes(word))
def parse_mark(self, token): def parse_mark(self, token):

9
assembler/assembler/util.py
View File

@ -1,6 +1,7 @@
""" """
Utility functions used for parsing. Utility functions used for parsing.
""" """
import struct
def can_be_mark(argument): def can_be_mark(argument):
@ -83,3 +84,11 @@ def autoint(value):
return int(value) return int(value)
def int16_2_bytes(value):
"""
Return the bytes representation of a 16bit unsigned
integer in 8bit words.
"""
if(value < 0):
return struct.pack("<h", value)
return struct.pack("<H", value)