annotate python/asm.py @ 297:a6f61e9a9d5c

Added docs requirements
author Windel Bouwman
date Sun, 01 Dec 2013 17:35:54 +0100
parents 1c7c1e619be8
children be7f60545368
rev   line source
213
003c8a976fff Merge of semantics and parser again ..
Windel Bouwman
parents: 206
diff changeset
1 import re, argparse
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
2 import pyyacc
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
3 from ppci import Token, CompilerError, SourceLocation
236
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
4 from target import Target, Label
200
5e391d9a3381 Split off asm nodes
Windel Bouwman
parents: 199
diff changeset
5 from asmnodes import ALabel, AInstruction, ABinop, AUnop, ASymbol, ANumber
159
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
6
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
7 def tokenize(s):
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
8 """
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
9 Tokenizer, generates an iterator that
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
10 returns tokens!
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
11
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
12 This GREAT example was taken from python re doc page!
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
13 """
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
14 tok_spec = [
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
15 ('REAL', r'\d+\.\d+'),
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
16 ('HEXNUMBER', r'0x[\da-fA-F]+'),
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
17 ('NUMBER', r'\d+'),
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
18 ('ID', r'[A-Za-z][A-Za-z\d_]*'),
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
19 ('SKIP', r'[ \t]'),
206
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
20 ('LEESTEKEN', r':=|[\.,=:\-+*\[\]/\(\)]|>=|<=|<>|>|<|}|{'),
198
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
21 ('STRING', r"'.*?'"),
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
22 ('COMMENT', r";.*")
159
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
23 ]
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
24 tok_re = '|'.join('(?P<%s>%s)' % pair for pair in tok_spec)
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
25 gettok = re.compile(tok_re).match
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
26 line = 1
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
27 pos = line_start = 0
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
28 mo = gettok(s)
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
29 while mo is not None:
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
30 typ = mo.lastgroup
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
31 val = mo.group(typ)
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
32 if typ == 'NEWLINE':
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
33 line_start = pos
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
34 line += 1
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
35 elif typ != 'SKIP':
199
a690473b79e2 Added msp430 target
Windel Bouwman
parents: 198
diff changeset
36 if typ == 'LEESTEKEN':
159
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
37 typ = val
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
38 elif typ == 'NUMBER':
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
39 val = int(val)
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
40 elif typ == 'HEXNUMBER':
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
41 val = int(val[2:], 16)
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
42 typ = 'NUMBER'
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
43 elif typ == 'REAL':
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
44 val = float(val)
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
45 elif typ == 'STRING':
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
46 val = val[1:-1]
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
47 col = mo.start() - line_start
287
1c7c1e619be8 File movage
Windel Bouwman
parents: 236
diff changeset
48 loc = SourceLocation('', line, col, 0) # TODO retrieve length?
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
49 yield Token(typ, val, loc)
159
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
50 pos = mo.end()
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
51 mo = gettok(s, pos)
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
52 if pos != len(s):
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
53 col = pos - line_start
287
1c7c1e619be8 File movage
Windel Bouwman
parents: 236
diff changeset
54 loc = SourceLocation('', line, col, 0)
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
55 raise CompilerError('Unexpected character {0}'.format(s[pos]), loc)
159
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
56
287
1c7c1e619be8 File movage
Windel Bouwman
parents: 236
diff changeset
57
159
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
58 class Lexer:
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
59 def __init__(self, src):
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
60 self.tokens = tokenize(src)
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
61 self.curTok = self.tokens.__next__()
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
62 def eat(self):
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
63 t = self.curTok
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
64 self.curTok = self.tokens.__next__()
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
65 return t
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
66 @property
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
67 def Peak(self):
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
68 return self.curTok
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
69
287
1c7c1e619be8 File movage
Windel Bouwman
parents: 236
diff changeset
70
218
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
71 class Parser:
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
72 def __init__(self):
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
73 # Construct a parser given a grammar:
195
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
74 ident = lambda x: x # Identity helper function
206
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
75 g = pyyacc.Grammar(['ID', 'NUMBER', ',', '[', ']', ':', '+', '-', '*', pyyacc.EPS, 'COMMENT', '{', '}'])
198
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
76 g.add_production('asmline', ['asmline2'])
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
77 g.add_production('asmline', ['asmline2', 'COMMENT'])
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
78 g.add_production('asmline2', ['label', 'instruction'])
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
79 g.add_production('asmline2', ['instruction'])
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
80 g.add_production('asmline2', ['label'])
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
81 g.add_production('asmline2', [])
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
82 g.add_production('optcomment', [])
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
83 g.add_production('optcomment', ['COMMENT'])
194
b01429a5d695 Fixed test
Windel Bouwman
parents: 193
diff changeset
84 g.add_production('label', ['ID', ':'], self.p_label)
195
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
85 g.add_production('instruction', ['opcode', 'operands'], self.p_ins_1)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
86 g.add_production('instruction', ['opcode'], self.p_ins_2)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
87 g.add_production('opcode', ['ID'], ident)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
88 g.add_production('operands', ['operand'], self.p_operands_1)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
89 g.add_production('operands', ['operands', ',', 'operand'], self.p_operands_2)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
90 g.add_production('operand', ['expression'], ident)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
91 g.add_production('operand', ['[', 'expression', ']'], self.p_mem_op)
206
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
92 g.add_production('operand', ['{', 'listitems', '}'], self.p_list_op)
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
93 g.add_production('listitems', ['expression'], self.p_listitems_1)
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
94 g.add_production('listitems', ['listitems', ',', 'expression'], self.p_listitems_2)
195
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
95 g.add_production('expression', ['term'], ident)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
96 g.add_production('expression', ['expression', 'addop', 'term'], self.p_binop)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
97 g.add_production('addop', ['-'], ident)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
98 g.add_production('addop', ['+'], ident)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
99 g.add_production('mulop', ['*'], ident)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
100 g.add_production('term', ['factor'], ident)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
101 g.add_production('term', ['term', 'mulop', 'factor'], self.p_binop)
200
5e391d9a3381 Split off asm nodes
Windel Bouwman
parents: 199
diff changeset
102 g.add_production('factor', ['ID'], lambda name: ASymbol(name))
5e391d9a3381 Split off asm nodes
Windel Bouwman
parents: 199
diff changeset
103 g.add_production('factor', ['NUMBER'], lambda num: ANumber(int(num)))
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
104 g.start_symbol = 'asmline'
195
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
105 self.p = g.genParser()
159
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
106
195
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
107 # Parser handlers:
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
108 def p_ins_1(self, opc, ops):
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
109 ins = AInstruction(opc, ops)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
110 self.emit(ins)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
111 def p_ins_2(self, opc):
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
112 self.p_ins_1(opc, [])
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
113 def p_operands_1(self, op1):
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
114 return [op1]
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
115 def p_operands_2(self, ops, comma, op2):
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
116 assert type(ops) is list
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
117 ops.append(op2)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
118 return ops
206
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
119
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
120 def p_listitems_1(self, li1):
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
121 return [li1]
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
122
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
123 def p_listitems_2(self, lis, comma, li2):
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
124 assert type(lis) is list
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
125 lis.append(li2)
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
126 return lis
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
127
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
128 def p_list_op(self, brace_open, lst, brace_close):
6c6bf8890d8a Added push and pop encodings
Windel Bouwman
parents: 203
diff changeset
129 return AUnop('{}', lst)
195
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
130 def p_mem_op(self, brace_open, exp, brace_close):
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
131 return AUnop('[]', exp)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
132 def p_label(self, lname, cn):
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
133 lab = ALabel(lname)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
134 self.emit(lab)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
135 def p_binop(self, exp1, op, exp2):
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
136 return ABinop(op, exp1, exp2)
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
137
218
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
138 def parse(self, tokens, emitter):
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
139 self.emit = emitter
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
140 self.p.parse(tokens)
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
141
219
1fa3e0050b49 Expanded ad hoc code generator
Windel Bouwman
parents: 218
diff changeset
142 # Pre construct parser to save time:
218
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
143 asmParser = Parser()
219
1fa3e0050b49 Expanded ad hoc code generator
Windel Bouwman
parents: 218
diff changeset
144
218
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
145 class Assembler:
236
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
146 def __init__(self, target=None, stream=None):
218
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
147 self.target = target
236
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
148 self.stream = stream
218
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
149 self.restart()
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
150 self.p = asmParser
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
151
196
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
152 # Top level interface:
199
a690473b79e2 Added msp430 target
Windel Bouwman
parents: 198
diff changeset
153 def restart(self):
236
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
154 self.stack = []
199
a690473b79e2 Added msp430 target
Windel Bouwman
parents: 198
diff changeset
155
195
37ac6c016e0f Expanded asm subsystem
Windel Bouwman
parents: 194
diff changeset
156 def emit(self, a):
196
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
157 """ Emit a parsed instruction """
236
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
158 self.stack.append(a)
196
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
159
194
b01429a5d695 Fixed test
Windel Bouwman
parents: 193
diff changeset
160 def parse_line(self, line):
b01429a5d695 Fixed test
Windel Bouwman
parents: 193
diff changeset
161 """ Parse line into asm AST """
b01429a5d695 Fixed test
Windel Bouwman
parents: 193
diff changeset
162 tokens = tokenize(line)
218
494828a7adf1 added some sort of cache to assembler
Windel Bouwman
parents: 213
diff changeset
163 self.p.parse(tokens, self.emit)
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
164
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
165 def assemble(self, asmsrc):
196
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
166 """ Assemble this source snippet """
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
167 for line in asmsrc.split('\n'):
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
168 self.assemble_line(line)
159
5e1dd04cb61c Added attempt to assembler
Windel Bouwman
parents:
diff changeset
169
196
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
170 def assemble_line(self, line):
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
171 """
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
172 Assemble a single source line.
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
173 Do not take newlines into account
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
174 """
196
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
175 self.parse_line(line)
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
176 self.assemble_aast()
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
177
198
33d50727a23c Fixup testscript
Windel Bouwman
parents: 197
diff changeset
178 def assemble_aast(self):
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
179 """ Assemble a parsed asm line """
199
a690473b79e2 Added msp430 target
Windel Bouwman
parents: 198
diff changeset
180 # TODO
a690473b79e2 Added msp430 target
Windel Bouwman
parents: 198
diff changeset
181 if not self.target:
a690473b79e2 Added msp430 target
Windel Bouwman
parents: 198
diff changeset
182 raise CompilerError('Cannot assemble without target')
236
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
183 while self.stack:
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
184 vi = self.stack.pop(0)
203
ca1ea402f6a1 Added some arm instructions
Windel Bouwman
parents: 200
diff changeset
185 if type(vi) is AInstruction:
236
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
186 mi = self.target.mapInstruction(vi)
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
187 elif type(vi) is ALabel:
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
188 mi = Label(vi.name)
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
189 else:
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
190 raise NotImplementedError('{}'.format(vi))
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
191 if self.stream:
8786811a5a59 Fix pcrel
Windel Bouwman
parents: 235
diff changeset
192 self.stream.emit(mi)
191
6b2bec5653f1 Added assembler testset
Windel Bouwman
parents: 159
diff changeset
193
196
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
194
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
195 if __name__ == '__main__':
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
196 # When run as main file, try to grab command line arguments:
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
197 parser = argparse.ArgumentParser(description="Assembler")
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
198 parser.add_argument('sourcefile', type=argparse.FileType('r'), help='the source file to assemble')
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
199 args = parser.parse_args()
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
200 a = Assembler()
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
201 obj = a.assemble(args.sourcefile.read())
ec2b423cdbea Merge asm and asmlib files
Windel Bouwman
parents: 195
diff changeset
202