Apple-2-Tools/atrcopy
1
0
Fork 0
mirror of https://github.com/robmcmullen/atrcopy.git synced 2024-06-25 18:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Added serializable memory map dict in segments

Browse Source
This commit is contained in:
Rob McMullen 2017-03-28 15:48:10 -07:00
parent 053c7a773e
commit c28a3426f9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
atrcopy/segments.py
View File

@ -341,7 +341,7 @@ class DefaultSegment(object):
savers = [SegmentSaver] savers = [SegmentSaver]
can_resize_default = False can_resize_default = False
def __init__(self, rawdata, start_addr=0, name="All", error=None, verbose_name=None): def __init__(self, rawdata, start_addr=0, name="All", error=None, verbose_name=None, memory_map=None):
self.start_addr = int(start_addr) # force python int to decouple from possibly being a numpy datatype self.start_addr = int(start_addr) # force python int to decouple from possibly being a numpy datatype
self.set_raw(rawdata) self.set_raw(rawdata)
self.error = error self.error = error
@ -350,6 +350,9 @@ class DefaultSegment(object):
self.page_size = -1 self.page_size = -1
self.map_width = 40 self.map_width = 40
self.uuid = str(uuid.uuid4()) self.uuid = str(uuid.uuid4())
if memory_map is None:
memory_map = {}
self.memory_map = memory_map
# Some segments may be resized to contain additional segments not # Some segments may be resized to contain additional segments not
# present when the segment was created. # present when the segment was created.
@ -407,8 +410,13 @@ class DefaultSegment(object):
state['_order_list'] = r.order.tolist() # more compact serialization in python list state['_order_list'] = r.order.tolist() # more compact serialization in python list
else: else:
state['_order_list'] = None state['_order_list'] = None
state['memory_map'] = sorted([list(i) for i in self.memory_map.iteritems()])
return state return state
def __setstate__(self, state):
self.memory_map = dict(state.pop('memory_map', []))
self.__dict__.update(state)
def reconstruct_missing(self): def reconstruct_missing(self):
"""Any instance attributes set in __init__, but added after some save """Any instance attributes set in __init__, but added after some save
files exist in the wild should be checked for and given default values files exist in the wild should be checked for and given default values