[PATCH 21/22] Implement memory TUI window

[Hannes Domani <ssbssa@yahoo.de>]

---
 gdb/python/lib/gdb/command/tui_windows.py | 57 +++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gdb/python/lib/gdb/command/tui_windows.py b/gdb/python/lib/gdb/command/tui_windows.py
index 92a7a2b2f01..45ba9502878 100644
--- a/gdb/python/lib/gdb/command/tui_windows.py
+++ b/gdb/python/lib/gdb/command/tui_windows.py
@@ -712,10 +712,65 @@ class FramesWindow(TextWindow):
             var_change_handler()
 
 
+class MemoryWindow(TextWindow):
+    def __init__(self, win):
+        super(MemoryWindow, self).__init__(win, "memory")
+        self.pointer = 0
+
+    def refill(self):
+        if not self.win.is_valid():
+            return
+        self.lines = []
+        pointer = self.pointer
+        try:
+            mem = gdb.selected_inferior().read_memory(pointer, 16 * self.win.height)
+            ptr_hex_count = int(gdb.lookup_type("void").pointer().sizeof) * 2
+            ofs = 0
+            for h in range(self.win.height):
+                l = "0x%0*x  " % (ptr_hex_count, pointer + ofs)
+                l += " ".join(["%02x%02x" % (ord(mem[ofs + i]), ord(mem[ofs + i + 1])) for i in range(0, 16, 2)])
+                l += "  "
+                l += "".join([self.printable(mem[ofs + i]) for i in range(16)])
+                self.lines.append(l)
+                ofs += 16
+        except:
+            self.lines = [str(sys.exc_info()[1])]
+        self.redraw()
+
+    def vscroll(self, num):
+        self.pointer += num * 16
+        if self.pointer < 0:
+            self.pointer = 0
+        self.refill()
+
+    def printable(self, c):
+        o = ord(c)
+        if o < 0x20 or o >= 0x7f:
+            return "."
+        return c
+
+class MemoryCommand(gdb.Command):
+    """Set start pointer for memory window."""
+
+    def __init__(self):
+        super(MemoryCommand, self).__init__("memory", gdb.COMMAND_TUI, gdb.COMPLETE_EXPRESSION)
+
+    def invoke(self, arg, from_tty):
+        self.dont_repeat()
+        global custom_windows
+        if 'memory' not in custom_windows or not custom_windows['memory'].win.is_valid():
+            gdb.execute("layout memory")
+        memory_window = custom_windows['memory']
+        memory_window.pointer = long(gdb.parse_and_eval(arg))
+
+MemoryCommand()
+
+
 gdb.register_window_type("locals", LocalsWindow)
 gdb.register_window_type("display", DisplayWindow)
 gdb.register_window_type("threads", ThreadsWindow)
 gdb.register_window_type("frames", FramesWindow)
+gdb.register_window_type("memory", MemoryWindow)
 
 
 class CustomCommandWindow(TextWindow):
@@ -778,6 +833,7 @@ gdb.execute("tui new-layout locals-frames {-horizontal src 2 {locals 2 frames 1}
 gdb.execute("tui new-layout display-frames {-horizontal src 2 {display 2 frames 1} 1} 2 status 0 cmd 1")
 gdb.execute("tui new-layout locals-display-frames {-horizontal src 2 {locals 2 display 2 frames 1} 1} 3 status 0 cmd 1")
 gdb.execute("tui new-layout threads-locals-frames-display {-horizontal src 3 {threads 1 locals 2} 1 {frames 1 display 2} 1} 3 status 0 cmd 1")
+gdb.execute("tui new-layout memory memory 1 src 2 status 0 cmd 1")
 gdb.execute("tui new-layout all {-horizontal {{-horizontal asm 1 regs 1} 1 src 2} 3 {threads 1 locals 2} 1 {frames 1 display 2} 1} 3 status 0 cmd 1")
 
 gdb.execute("alias ll = layout locals")
@@ -790,4 +846,5 @@ gdb.execute("alias llf = layout locals-frames")
 gdb.execute("alias ldf = layout display-frames")
 gdb.execute("alias lldf = layout locals-display-frames")
 gdb.execute("alias ltlfd = layout threads-locals-frames-display")
+gdb.execute("alias lm = layout memory")
 gdb.execute("alias la = layout all")
-- 
2.30.1