3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elf_mem_map: improve alignment of arrays

Browse Source
This commit is contained in:
Yuri D'Elia 2021-06-05 18:03:36 +02:00 committed by DRracer
parent cb4f5cff9f
commit 71ef94da2e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/elf_mem_map
View File

@ -149,8 +149,8 @@ def get_elf_globals(path, expand_structs, struct_gaps=True):
'DW_AT_upper_bound' in range_DIE.attributes: 'DW_AT_upper_bound' in range_DIE.attributes:
m_array_dim.append(range_DIE.attributes['DW_AT_upper_bound'].value + 1) m_array_dim.append(range_DIE.attributes['DW_AT_upper_bound'].value + 1)
# likely string, remove one dimension
if m_byte_size == 1 and len(m_array_dim) > 1: if m_byte_size == 1 and len(m_array_dim) > 1:
# likely string, remove one dimension
m_byte_size *= m_array_dim.pop() m_byte_size *= m_array_dim.pop()
if len(m_array_dim) == 0 or (len(m_array_dim) == 1 and m_array_dim[0] == 1): if len(m_array_dim) == 0 or (len(m_array_dim) == 1 and m_array_dim[0] == 1):
# plain entry # plain entry
@ -166,7 +166,7 @@ def get_elf_globals(path, expand_structs, struct_gaps=True):
# location index # location index
sfx = '' sfx = ''
for d in range(len(m_array_dim)): for d in range(len(m_array_dim)):
sfx += '[{}]'.format(m_array_loc[d]) sfx += '[{}]'.format(str(m_array_loc[d]).rjust(len(str(m_array_dim[d]-1)), '0'))
members.append(Member(m_name + sfx, m_array_pos, m_byte_size)) members.append(Member(m_name + sfx, m_array_pos, m_byte_size))
@ -202,8 +202,8 @@ def get_elf_globals(path, expand_structs, struct_gaps=True):
grefs.append(Entry(entry.name + '.' + member.name, grefs.append(Entry(entry.name + '.' + member.name,
entry.loc + member.off, member.size)) entry.loc + member.off, member.size))
# likely string, remove one dimension
if byte_size == 1 and len(array_dim) > 1: if byte_size == 1 and len(array_dim) > 1:
# likely string, remove one dimension
byte_size *= array_dim.pop() byte_size *= array_dim.pop()
if len(array_dim) == 0 or (len(array_dim) == 1 and array_dim[0] == 1): if len(array_dim) == 0 or (len(array_dim) == 1 and array_dim[0] == 1):
# plain entry # plain entry
@ -219,7 +219,7 @@ def get_elf_globals(path, expand_structs, struct_gaps=True):
# location index # location index
sfx = '' sfx = ''
for d in range(len(array_dim)): for d in range(len(array_dim)):
sfx += '[{}]'.format(array_loc[d]) sfx += '[{}]'.format(str(array_loc[d]).rjust(len(str(array_dim[d]-1)), '0'))
expand_members(Entry(name + sfx, array_pos, byte_size), members) expand_members(Entry(name + sfx, array_pos, byte_size), members)