Commit bef1aba8ceb5439b4cde834690e14969775816b3 - SixtyPical

Do not assume every label refers to a word-sized chunk of memory. Chris Pressey 4 years ago

3 changed file(s) with 35 addition(s) and 10 deletion(s). Raw diff Collapse all Expand all

+20

-6

src/sixtypical/compiler.py less more

2	2	from sixtypical.ast import Program, Routine, Block, Instr
3	3	from sixtypical.model import (
4	4	ConstantRef, LocationRef, IndexedRef, IndirectRef, AddressRef,
5		TYPE_BIT, TYPE_BYTE, TYPE_WORD, TYPE_WORD_TABLE, BufferType, PointerType, RoutineType, VectorType,
	5	TYPE_BIT, TYPE_BYTE, TYPE_BYTE_TABLE, TYPE_WORD, TYPE_WORD_TABLE, BufferType, PointerType, RoutineType, VectorType,
6	6	REG_A, REG_X, REG_Y, FLAG_C
7	7	)
8	8	from sixtypical.emitter import Byte, Label, Offset, LowAddressByte, HighAddressByte

34	34	assert isinstance(program, Program)
35	35
36	36	for defn in program.defns:
37		label = Label(defn.name)
38		if defn.addr is not None:
39		label.set_addr(defn.addr)
40		self.labels[defn.name] = label
	37	# compute length of memory pointed to. this is awful.
	38	length = None
	39	type_ = defn.location.type
	40	if type_ == TYPE_BYTE:
	41	length = 1
	42	elif type_ == TYPE_WORD or isinstance(type_, (PointerType, VectorType)):
	43	length = 2
	44	elif type_ == TYPE_BYTE_TABLE:
	45	length = 256
	46	elif type_ == TYPE_WORD_TABLE:
	47	length = 512
	48	elif isinstance(type_, BufferType):
	49	length = type_.size
	50	if length is None:
	51	raise NotImplementedError("Need size for type {}".format(type_))
	52	self.labels[defn.name] = Label(defn.name, addr=defn.addr, length=length)
41	53
42	54	for routine in program.routines:
43	55	self.routines[routine.name] = routine

59	71	for defn in program.defns:
60	72	if defn.initial is not None:
61	73	label = self.labels[defn.name]
	74	initial_data = Byte(defn.initial) # TODO: support other types than Byte
	75	label.set_length(initial_data.size())
62	76	self.emitter.resolve_label(label)
63		self.emitter.emit(Byte(defn.initial))
	77	self.emitter.emit(initial_data)
64	78
65	79	# uninitialized, "BSS" data
66	80	for defn in program.defns:

+14

-4

src/sixtypical/emitter.py less more

	0	"""Binary machine code emitter. Used in SixtyPical to emit 6502 machine code,
	1	but not specific to SixtyPical, or 6502. Not even necessarily machine code -
	2	though some parts are written around the assumptions of 8-bit architectures."""
	3
	4
0	5	class Emittable(object):
1	6	def size(self):
2	7	raise NotImplementedError

53	58
54	59
55	60	class Label(Emittable):
56		def __init__(self, name, addr=None):
	61	def __init__(self, name, addr=None, length=None):
57	62	self.name = name
58	63	self.addr = addr
	64	self.length = length
59	65
60	66	def set_addr(self, addr):
61	67	self.addr = addr
	68
	69	def set_length(self, length):
	70	self.length = length
62	71
63	72	def size(self):
64	73	return 2

76	85	return Byte(self.addr + offset).serialize()
77	86
78	87	def __repr__(self):
79		addrs = ', addr=%r' % self.addr if self.addr is not None else ''
80		return "%s(%r%s)" % (self.__class__.__name__, self.name, addrs)
	88	addr_s = ', addr=%r' % self.addr if self.addr is not None else ''
	89	length_s = ', length=%r' % self.length if self.length is not None else ''
	90	return "%s(%r%s%s)" % (self.__class__.__name__, self.name, addr_s, length_s)
81	91
82	92
83	93	class Offset(Emittable):

164	174	"""Set the given label to be at the current address and
165	175	advance the address for the next label, but don't emit anything."""
166	176	self.resolve_label(label)
167		self.addr += label.size()
	177	self.addr += label.length

-0

src/sixtypical/model.py less more

0	0	"""Data/storage model for SixtyPical."""
	1
1	2
2	3	class Type(object):
3	4	def __init__(self, name):