Mercurial > lcfOS
diff python/hexfile.py @ 246:f254b87258e6
Added hexfile to zcc
author | Windel Bouwman |
---|---|
date | Thu, 25 Jul 2013 08:11:30 +0200 |
parents | 66912720d712 |
children | 6ed3d3a82a63 |
line wrap: on
line diff
--- a/python/hexfile.py Wed Jul 24 22:40:29 2013 +0200 +++ b/python/hexfile.py Thu Jul 25 08:11:30 2013 +0200 @@ -80,7 +80,8 @@ raise HexFileException('record type {0} not implemented'.format(typ)) def __repr__(self): - return 'Hexfile with {} regions'.format(len(self.regions)) + size = sum(len(r.data) for r in self.regions) + return 'Hexfile containing {} bytes'.format(size) def dump(self): print(self) @@ -114,6 +115,9 @@ self.regions.remove(r2) change = True + def merge(self, other): + for r in other.regions: + self.addRegion(r.address, r.data) def save(self, f): def emit(address, typ, data=bytes()):