Revert "Improvements to memory vieweing"

Author: zcutlip

voltron/config/default.cfg

@@ -128,39 +128,6 @@ view:
                 attrs: []
         format:
             addr_format: "{0:0=16X}"
-    memorystride_view:
-        header:
-            show: false
-        footer:
-            show: true
-            label_left:
-                name: title
-                colour: white
-                bg_colour: grey
-                attrs:
-                - bold
-            label_right:
-                name: info
-                colour: blue
-                bg_colour: grey
-                attrs: []
-        format:
-            addr_format: "{0:0=16X}"
-        keymap:
-            q: exit
-            p: page_up
-            n: page_down
-            KEY_PPAGE: page_up
-            KEY_NPAGE: page_down
-            KEY_UP: line_up
-            KEY_DOWN: line_down
-            KEY_ENTER: reset
-            s: toggle_signed
-            l: toggle_length
-            h: hex_mode
-            d: dec_mode
-            =: inc_row_len
-            -: dec_row_len
     backtrace_view:
         header:
             show: false

voltron/plugins/api/memory.py

@@ -2,7 +2,6 @@
 import logging
 import six
 import struct
-import binascii
 
 from voltron.api import *
 
@@ -109,9 +108,7 @@ def dispatch(self):
 
             res = APIMemoryResponse()
             res.address = addr
-            #don't use six.u since it processes escape sequences ie... breaks if we have 0x5C 0x37 in memory
-            #res.memory = six.u(memory)
-            res.memory = binascii.hexlify(memory)
+            res.memory = six.u(memory)
             res.bytes = len(memory)
             res.deref = deref
         except TargetBusyException:

voltron/plugins/view/memory.py

@@ -1,6 +1,5 @@
 import logging
 import six
-import binascii
 import pygments
 import pygments.formatters
 from pygments.token import *
@@ -84,7 +83,6 @@ def generate_tokens(self, results):
 
         if m_res and m_res.is_success:
             bytes_per_chunk = self.args.words*target['addr_size'] if self.args.words else self.args.bytes
-            m_res.memory = binascii.unhexlify(m_res.memory)
             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))
@@ -96,11 +94,8 @@ def generate_tokens(self, results):
                     n = "%02X" % x
                     token = Text if x else Comment
                     if self.args.track and self.last_memory and self.last_address == m_res.address:
-                        try:
-                            if x != six.indexbytes(self.last_memory, c + i):
-                                token = Error
-                        except:
-                            pass
+                        if x != six.indexbytes(self.last_memory, c + i):
+                            token = Error
                     byte_array.append((token, n))
 
                 if self.args.words: