1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix LLDB heap_page command

Browse Source 
Move _append_command_output and _append_expression to LLDBInterface, and
use it from HeapPageCommand after setting result.
This commit is contained in:
Étienne Barrié 2025-04-10 15:24:52 +02:00 committed by Jean Boussier
parent 0606046c1a
commit 6e184ebb5a
Notes: git 2025-04-15 02:59:20 +00:00 
Merged: https://github.com/ruby/ruby/pull/13096
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
misc/lldb_rb/commands/heap_page_command.py
View File

@ -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()

11
misc/lldb_rb/lldb_interface.py
View File

@ -5,3 +5,14 @@ class LLDBInterface:
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)

11
misc/lldb_rb/utils.py
View File

@ -8,17 +8,6 @@ class RbInspector(LLDBInterface):
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():