7u83/stcgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ihex: fix non-contiguous ranges

Browse Source 
I thought this thing worked, but it turns out it is horribly broken.
Rewrite extraction and use bytearray, which is more efficient anyway.
This commit is contained in:
Grigori Goronzy 2015-11-25 01:35:20 +01:00
parent c0a9b381c9
commit 8d800d1090
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stcgal/ihex.py
View File

@ -69,24 +69,27 @@ class IHex(object):
start = 0 start = 0
if end is None: if end is None:
end = 0 result = bytearray()
result = bytes()
for addr, data in self.areas.items(): for addr, data in self.areas.items():
if addr >= start: if addr >= start:
end = max(end, addr + len(data)) if len(result) < (addr - start):
result = result[:start] + data[start-addr:end-addr] + result[end:] result[len(result):len(result)+addr-start] = bytes(addr-start)
result[addr-start:addr-start+len(data)] = data
return result return bytes(result)
else: else:
result = bytes() result = bytearray()
for addr, data in self.areas.items(): for addr, data in self.areas.items():
if addr >= start and addr < end: if addr >= start and addr < end:
result = result[:start] + data[start-addr:end-addr] + result[end:] data = data[:end-addr]
if len(result) < (addr - start):
result[len(result):len(result)+addr-start] = bytes(addr-start)
result[addr-start:addr-start+len(data)] = data
return result return bytes(result)
def set_start(self, start=None): def set_start(self, start=None):
self.start = start self.start = start