Fix LLDB heap_page command

Move _append_command_output and _append_expression to LLDBInterface, and
use it from HeapPageCommand after setting result.

Author: etiennebarrie

misc/lldb_rb/commands/heap_page_command.py

@@ -8,14 +8,15 @@ class HeapPageCommand(RbBaseCommand):
     help_string = "prints out 'struct heap_page' for a VALUE pointer in the page"
 
     def call(self, debugger, command, exe_ctx, result):
+        self.result = result
         self.t_heap_page_body = self.target.FindFirstType("struct heap_page_body")
         self.t_heap_page_ptr = self.target.FindFirstType("struct heap_page").GetPointerType()
 
         page = self._get_page(self.frame.EvaluateExpression(command))
         page.Cast(self.t_heap_page_ptr)
 
-        self._append_expression(debugger, "(struct heap_page *) %0#x" % page.GetValueAsUnsigned(), result)
-        self._append_expression(debugger, "*(struct heap_page *) %0#x" % page.GetValueAsUnsigned(), result)
+        self._append_expression("(struct heap_page *) %0#x" % page.GetValueAsUnsigned())
+        self._append_expression("*(struct heap_page *) %0#x" % page.GetValueAsUnsigned())
 
     def _get_page(self, val):
         addr = val.GetValueAsUnsigned()

misc/lldb_rb/lldb_interface.py

@@ -5,3 +5,14 @@ def build_environment(self, debugger):
         self.process = self.target.GetProcess()
         self.thread = self.process.GetSelectedThread()
         self.frame = self.thread.GetSelectedFrame()
+
+    def _append_command_output(self, command):
+        output1 = self.result.GetOutput()
+        self.debugger.GetCommandInterpreter().HandleCommand(command, self.result)
+        output2 = self.result.GetOutput()
+        self.result.Clear()
+        self.result.write(output1)
+        self.result.write(output2)
+
+    def _append_expression(self, expression):
+        self._append_command_output("expression " + expression)

misc/lldb_rb/utils.py

@@ -8,17 +8,6 @@ def __init__(self, debugger, result, ruby_globals):
         self.result = result
         self.ruby_globals = ruby_globals
 
-    def _append_command_output(self, command):
-        output1 = self.result.GetOutput()
-        self.debugger.GetCommandInterpreter().HandleCommand(command, self.result)
-        output2 = self.result.GetOutput()
-        self.result.Clear()
-        self.result.write(output1)
-        self.result.write(output2)
-
-    def _append_expression(self, expression):
-        self._append_command_output("expression " + expression)
-
     def string2cstr(self, rstring):
         """Returns the pointer to the C-string in the given String object"""
         if rstring.TypeIsPointerType():