snare
/
voltron
mirror of https://github.com/snare/voltron.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #215 from wangray/master 

Added ability to specify number of words to display with args.words
This commit is contained in:
snare 2018-02-15 08:26:47 -08:00 committed by GitHub
parent 233b558e3d 97ff2dabf1
commit 4ee3cbe6f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
voltron/plugins/view/memory.py
View File

@ -26,10 +26,11 @@ class MemoryView(TerminalView):
help='display the data in a column one CPU word wide and dereference any valid pointers', help='display the data in a column one CPU word wide and dereference any valid pointers',
default=False) default=False)
group.add_argument('--bytes', '-b', action='store', type=int, help='bytes per line (default 16)', default=16) group.add_argument('--bytes', '-b', action='store', type=int, help='bytes per line (default 16)', default=16)
group.add_argument('--words', '-w', action='store', type=int, help='machine words per line', default=0)
sp.add_argument('--reverse', '-v', action='store_true', help='reverse the output', default=False) sp.add_argument('--reverse', '-v', action='store_true', help='reverse the output', default=False)
sp.add_argument('--track', '-t', action='store_true', help='track and highlight changes', default=True) sp.add_argument('--track', '-t', action='store_true', help='track and highlight changes', default=True)
sp.add_argument('--no-track', '-T', action='store_false', help='don\'t track and highlight changes') sp.add_argument('--no-track', '-T', action='store_false', help='don\'t track and highlight changes')
sp.add_argument('--words', '-w', action='store_true', help='display data as a column of machine words', default=False)
group = sp.add_mutually_exclusive_group(required=False) group = sp.add_mutually_exclusive_group(required=False)
group.add_argument('--address', '-a', action='store', group.add_argument('--address', '-a', action='store',
help='address (in hex or decimal) from which to start reading memory') help='address (in hex or decimal) from which to start reading memory')
@ -65,7 +66,7 @@ class MemoryView(TerminalView):
args['words'] = height args['words'] = height
args['offset'] = self.scroll_offset if self.args.reverse else -self.scroll_offset args['offset'] = self.scroll_offset if self.args.reverse else -self.scroll_offset
else: else:
args['length'] = height * self.args.bytes args['length'] = height * self.args.bytes * 2
args['offset'] = self.scroll_offset * self.args.bytes * (1 if self.args.reverse else -1) args['offset'] = self.scroll_offset * self.args.bytes * (1 if self.args.reverse else -1)
# get memory and target info # get memory and target info
@ -81,8 +82,9 @@ class MemoryView(TerminalView):
target = t_res.targets[0] target = t_res.targets[0]
if m_res and m_res.is_success: if m_res and m_res.is_success:
for c in range(0, m_res.bytes, self.args.bytes): bytes_per_chunk = self.args.words*target['addr_size'] if self.args.words else self.args.bytes
chunk = m_res.memory[c:c + self.args.bytes] for c in range(0, m_res.bytes, bytes_per_chunk):
chunk = m_res.memory[c:c + bytes_per_chunk]
yield (Name.Label, self.format_address(m_res.address + c, size=target['addr_size'], pad=False)) yield (Name.Label, self.format_address(m_res.address + c, size=target['addr_size'], pad=False))
yield (Name.Label, ': ') yield (Name.Label, ': ')
@ -98,10 +100,12 @@ class MemoryView(TerminalView):
if self.args.words: if self.args.words:
if target['byte_order'] =='little': if target['byte_order'] =='little':
byte_array.reverse() byte_array_words = [byte_array[i:i+ target['addr_size']] for i in range(0, bytes_per_chunk, target['addr_size'])]
for x in byte_array: for word in byte_array_words:
yield x word.reverse()
yield (Text, ' ') for x in word:
yield x
yield (Text, ' ')
else: else:
for x in byte_array: for x in byte_array:
yield x yield x