annotate python/ppci/linker.py @ 381:6df89163e114

Fix section and ldr pseudo instruction
author Windel Bouwman
date Sat, 26 Apr 2014 17:41:56 +0200
parents 9667d78ba79e
children 173e20a47fda
rev   line source
348
442fb043d149 Added log option to zcc
Windel Bouwman
parents: 345
diff changeset
1 import logging
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
2 import struct
334
6f4753202b9a Added more recipes
Windel Bouwman
parents:
diff changeset
3 from .objectfile import ObjectFile
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
4 from . import CompilerError
365
98ff43cfdd36 Nasty bug in adr instruction
Windel Bouwman
parents: 364
diff changeset
5 from .bitfun import encode_imm32
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
6
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
7 def align(x, m):
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
8 while ((x % m) != 0):
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
9 x = x + 1
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
10 return x
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
11
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
12 def wrap_negative(x, bits):
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
13 b = struct.unpack('<I', struct.pack('<i', x))[0]
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
14 mask = (1 << bits) - 1
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
15 return b & mask
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
16
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
17 reloc_map = {}
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
18
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
19 def reloc(t):
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
20 def f(c):
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
21 reloc_map[t] = c
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
22 return f
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
23
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
24
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
25 @reloc('lit_add_8')
336
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
26 def apply_lit8(reloc, sym, section, reloc_value):
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
27 assert sym.value % 4 == 0
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
28 offset = (sym.value - (align(reloc_value + 2, 4)))
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
29 assert offset in range(0, 1024, 4), str(offset)+str( self.dst.sections)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
30 rel8 = offset >> 2
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
31 section.data[reloc.offset] = rel8
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
32
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
33
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
34 @reloc('wrap_new11')
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
35 def apply_wrap_new11(reloc, sym, section, reloc_value):
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
36 offset = sym.value - (align(reloc_value, 2) + 4)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
37 assert offset in range(-2048, 2046, 2)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
38 imm11 = wrap_negative(offset >> 1, 11)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
39 section.data[reloc.offset] = (imm11 & 0xff)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
40 section.data[reloc.offset + 1] |= (imm11 >> 8) & 0x7
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
41
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
42
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
43 @reloc('rel8')
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
44 def apply_rel8(reloc, sym, section, reloc_value):
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
45 assert sym.value % 2 == 0
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
46 offset = sym.value - (align(reloc_value, 2) + 4)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
47 assert offset in range(-256, 254, 2), str(offset) + str(reloc)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
48 imm8 = wrap_negative(offset >> 1, 8)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
49 section.data[reloc.offset] = imm8
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
50
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
51
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
52 @reloc('bl_imm11_imm10')
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
53 def apply_bl_imm11(reloc, sym, section, reloc_value):
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
54 assert sym.value % 2 == 0
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
55 offset = sym.value - (align(reloc_value, 2) + 4)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
56 assert offset in range(-16777216, 16777214, 2), str(offset)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
57 imm32 = wrap_negative(offset >> 1, 32)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
58 imm11 = imm32 & 0x7FF
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
59 imm10 = (imm32 >> 11) & 0x3FF
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
60 s = (imm32 >> 24) & 0x1
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
61 section.data[reloc.offset + 2] = imm11 & 0xFF
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
62 section.data[reloc.offset + 3] |= (imm11 >> 8) & 0x7
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
63 section.data[reloc.offset] = imm10 & 0xff
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
64 section.data[reloc.offset + 1] |= ((imm10 >> 8) & 0x3) | (s << 2)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
65
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
66 @reloc('b_imm11_imm6')
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
67 def apply_b_imm11_imm6(reloc, sym, section, reloc_value):
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
68 assert sym.value % 2 == 0
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
69 offset = sym.value - (align(reloc_value, 2) + 4)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
70 assert offset in range(-1048576, 1048574, 2), str(offset)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
71 imm32 = wrap_negative(offset >> 1, 32)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
72 imm11 = imm32 & 0x7FF
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
73 imm6 = (imm32 >> 11) & 0x3F
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
74 s = (imm32 >> 24) & 0x1
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
75 section.data[reloc.offset + 2] = imm11 & 0xFF
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
76 section.data[reloc.offset + 3] |= (imm11 >> 8) & 0x7
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
77 section.data[reloc.offset] |= imm6
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
78 section.data[reloc.offset + 1] |= (s << 2)
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
79
345
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
80 # ARM reloc!!
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
81 # TODO: move to target classes???
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
82 @reloc('b_imm24')
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
83 def apply_b_imm24(reloc, sym, section, reloc_value):
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
84 assert sym.value % 4 == 0
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
85 assert reloc_value % 4 == 0
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
86 offset = (sym.value - (reloc_value + 8))
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
87 rel24 = wrap_negative(offset >> 2, 24)
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
88 section.data[reloc.offset+2] = (rel24 >> 16) & 0xFF
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
89 section.data[reloc.offset+1] = (rel24 >> 8) & 0xFF
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
90 section.data[reloc.offset+0] = rel24 & 0xFF
b4882ff0ed06 Added more arm isa tests
Windel Bouwman
parents: 336
diff changeset
91
334
6f4753202b9a Added more recipes
Windel Bouwman
parents:
diff changeset
92
350
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
93 @reloc('ldr_imm12')
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
94 def apply_ldr_imm12(reloc, sym, section, reloc_value):
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
95 assert sym.value % 4 == 0
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
96 assert reloc_value % 4 == 0
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
97 offset = (sym.value - (reloc_value + 8))
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
98 U = 1
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
99 if offset < 0:
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
100 offset = -offset
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
101 U = 0
381
6df89163e114 Fix section and ldr pseudo instruction
Windel Bouwman
parents: 377
diff changeset
102 assert offset < 4096, str(sym) + str(section) + str(reloc)
365
98ff43cfdd36 Nasty bug in adr instruction
Windel Bouwman
parents: 364
diff changeset
103 section.data[reloc.offset+2] |= (U << 7)
350
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
104 section.data[reloc.offset+1] |= (offset >> 8) & 0xF
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
105 section.data[reloc.offset+0] = offset & 0xFF
2b02bd286fe9 Fixed A9 hello worle
Windel Bouwman
parents: 348
diff changeset
106
354
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
107 @reloc('adr_imm12')
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
108 def apply_adr_imm12(reloc, sym, section, reloc_value):
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
109 assert sym.value % 4 == 0
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
110 assert reloc_value % 4 == 0
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
111 offset = (sym.value - (reloc_value + 8))
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
112 U = 2
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
113 if offset < 0:
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
114 offset = -offset
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
115 U = 1
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
116 assert offset < 4096
365
98ff43cfdd36 Nasty bug in adr instruction
Windel Bouwman
parents: 364
diff changeset
117 offset = encode_imm32(offset)
364
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
118 section.data[reloc.offset+2] |= (U << 6)
354
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
119 section.data[reloc.offset+1] |= (offset >> 8) & 0xF
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
120 section.data[reloc.offset+0] = offset & 0xFF
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
121
364
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
122 @reloc('absaddr32')
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
123 def apply_absaddr32(reloc, sym, section, reloc_value):
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
124 assert sym.value % 4 == 0
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
125 assert reloc_value % 4 == 0
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
126 offset = sym.value
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
127 section.data[reloc.offset+3] = (offset >> 24) & 0xFF
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
128 section.data[reloc.offset+2] = (offset >> 16) & 0xFF
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
129 section.data[reloc.offset+1] = (offset >> 8) & 0xFF
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
130 section.data[reloc.offset+0] = offset & 0xFF
c49459768aaa Work on globals
Windel Bouwman
parents: 363
diff changeset
131
354
5477e499b039 Added some sort of string functionality
Windel Bouwman
parents: 350
diff changeset
132
334
6f4753202b9a Added more recipes
Windel Bouwman
parents:
diff changeset
133 class Linker:
336
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
134 """ Merges the sections of several object files and
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
135 performs relocation """
348
442fb043d149 Added log option to zcc
Windel Bouwman
parents: 345
diff changeset
136 def __init__(self):
442fb043d149 Added log option to zcc
Windel Bouwman
parents: 345
diff changeset
137 self.logger = logging.getLogger('Linker')
442fb043d149 Added log option to zcc
Windel Bouwman
parents: 345
diff changeset
138
381
6df89163e114 Fix section and ldr pseudo instruction
Windel Bouwman
parents: 377
diff changeset
139 def link(self, objs, layout):
377
9667d78ba79e Switched to xml for project description
Windel Bouwman
parents: 365
diff changeset
140 assert type(objs) is list
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
141 # Create new object file to store output:
334
6f4753202b9a Added more recipes
Windel Bouwman
parents:
diff changeset
142 self.dst = ObjectFile()
336
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
143
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
144 # Create sections with address:
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
145 for section_name, address in layout.items():
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
146 self.dst.get_section(section_name).address = address
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
147
334
6f4753202b9a Added more recipes
Windel Bouwman
parents:
diff changeset
148 # First copy all sections into output sections:
6f4753202b9a Added more recipes
Windel Bouwman
parents:
diff changeset
149 for iobj in objs:
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
150 offsets = {}
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
151 # Merge sections:
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
152 for in_s in iobj.sections.values():
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
153 out_s = self.dst.get_section(in_s.name)
336
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
154 # TODO: align section in other way:
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
155 while out_s.Size % 4 != 0:
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
156 out_s.add_data(bytes([0]))
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
157
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
158 # Add new section:
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
159 offsets[in_s.name] = out_s.Size
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
160 out_s.add_data(in_s.data)
348
442fb043d149 Added log option to zcc
Windel Bouwman
parents: 345
diff changeset
161 self.logger.debug('{} {}({})'.format(offsets[in_s.name], iobj, in_s.name))
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
162
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
163 # Merge symbols:
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
164 for sym in iobj.symbols.values():
336
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
165 out_s = self.dst.get_section(sym.section)
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
166 value = offsets[sym.section] + out_s.address + sym.value
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
167 self.dst.add_symbol(sym.name, value, sym.section)
363
396e5cefba13 Removed debuginfo instruction
Windel Bouwman
parents: 354
diff changeset
168 self.logger.debug('{} at 0x{:08X} in section {}'.format(sym.name, value, sym.section))
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
169
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
170 # Merge relocations:
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
171 for reloc in iobj.relocations:
336
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
172 offset = offsets[reloc.section] + reloc.offset
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
173 self.dst.add_relocation(reloc.sym, offset, reloc.typ, reloc.section)
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
174
381
6df89163e114 Fix section and ldr pseudo instruction
Windel Bouwman
parents: 377
diff changeset
175 # Apply layout rules:
6df89163e114 Fix section and ldr pseudo instruction
Windel Bouwman
parents: 377
diff changeset
176 # TODO
6df89163e114 Fix section and ldr pseudo instruction
Windel Bouwman
parents: 377
diff changeset
177
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
178 # Perform relocations:
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
179 for reloc in self.dst.relocations:
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
180 # Lookup symbol:
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
181 if reloc.sym not in self.dst.symbols:
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
182 raise CompilerError('Undefined reference "{}"'.format(reloc.sym))
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
183 sym = self.dst.symbols[reloc.sym]
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
184 # patch up:
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
185 section = self.dst.get_section(reloc.section)
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
186
336
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
187 # Determine location in memory of reloc patchup position:
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
188 reloc_value = section.address + reloc.offset
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
189
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
190 if reloc.typ in reloc_map:
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
191 f = reloc_map[reloc.typ]
d1ecc493384e Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
Windel Bouwman
parents: 335
diff changeset
192 f(reloc, sym, section, reloc_value)
335
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
193 else:
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
194 raise NotImplementedError('Unknown relocation type {}'.format(reloc.typ))
582a1aaa3983 Added long branch format
Windel Bouwman
parents: 334
diff changeset
195
334
6f4753202b9a Added more recipes
Windel Bouwman
parents:
diff changeset
196 return self.dst