Start allowing column number breakpoints

Author: rocky

test/unit/processor/test_proc_complete.py

@@ -63,7 +63,7 @@ def test_completion():
             "info ",
             [
                 "args",
-                "break",
+                "breakpoints",
                 "builtins",
                 "code",
                 "display",

trepan/lib/breakpoint.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2015, 2017, 2020, 2024-2026 Rocky Bernstein <[email protected]>
-#
 #  Copyright (C) 2009-2010, 2013, 2015-2018, 2020, 2022, 2024-2026 Rocky Bernstein
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -29,7 +27,6 @@
 from pyficache import (
     code_position_cache,
     code_loop_for_positions,
-    get_linecache_info,
 )
 from xdis import load_module
 
@@ -78,36 +75,29 @@ def __init__(
             # code.co_filename? Probably not: trepan3k and pyficache do allow for
             # remapping filenames.
 
-        linecache_info = get_linecache_info(filename)
-
         if is_code_offset and position and position >= 0:
             self.column = None
             # Figure out column offset, and possibly the code offset.
-            if (code_offset_tuples := linecache_info.line_info.get(line_number)) is not None:
-                if found := next((item for item in code_offset_tuples if item[-1] == position), None):
-                    self.offset = position
-                    found_code = found[0]
-
-                    # Figure out column offset
-                    if found_code not in code_position_cache:
-                        code_loop_for_positions(found_code)
-
-                    if (code_info := code_position_cache.get(found_code)) is not None:
-                        # Now get the column start value from the line number and code offset.
-                        column_range = code_info.lineno_and_offset.get((line_number, self.offset))
-                        if column_range:
-                            assert isinstance(column_range, tuple)
-                            start_line, self.column = column_range[0]
-                            # Python stores columns starting 0 in a line.
-                            # For realgud and lldb compatibility (among others),
-                            # we use columns starting at 1.
-                            self.column += 1
-                            assert start_line == line_number
-                            pass
-                        else:
-                            print("Can't find column")
-                        pass
+            self.offset = position
+
+            # Figure out column offset
+            if code not in code_position_cache:
+                code_loop_for_positions(code)
+
+            if (code_info := code_position_cache.get(code)) is not None:
+                # Now get the column start value from the line number and code offset.
+                column_range = code_info.lineno_and_offset.get((line_number, self.offset))
+                if column_range:
+                    assert isinstance(column_range, tuple)
+                    start_line, self.column = column_range[0]
+                    # Python stores columns starting 0 in a line.
+                    # For realgud and lldb compatibility (among others),
+                    # we use columns starting at 1.
+                    self.column += 1
+                    assert start_line == line_number
                     pass
+                else:
+                    print(f"Can't find column for line {line_number}, offset {self.offset}")
                 pass
             pass
         else:
@@ -152,7 +142,7 @@ def __str__(self):
             disp = disp + "no   "
 
         if self.offset is None:
-            offset_str = " any"
+            offset_str = "  any"
         else:
             offset_str = "%4d" % self.offset
 
@@ -495,7 +485,7 @@ def checkfuncname(brkpt: Breakpoint, frame: FrameType):
 
     # Breakpoint set via function code object
 
-    if frame.f_code != brkpt.code:
+    if frame.f_code != brkpt.code and brkpt.offset is not None:
         # It's not a function call, but rather execution of def statement.
         return False
 

trepan/lib/core.py

@@ -302,7 +302,11 @@ def is_break_here(self, frame):
                     bp_fn = self.bpmgr.code_list.get(fn)
                     if not bp_fn:
                         return False
-                    self.current_bp = bp = bp_fn[0]
+                    bp = bp_fn[0]
+                    if bp.offset is not None and bp.offset != frame.f_lasti:
+                        # print(f"XXXX core: have breakpoint, but offsets mismatch {bp.offset} vs {frame.f_lasti}")
+                        return False
+                    self.current_bp = bp
                     if bp.temporary:
                         msg = "temporary "
                         self.bpmgr.delete_breakpoint(bp)
@@ -317,6 +321,10 @@ def is_break_here(self, frame):
         if (filename, frame.f_lineno) in list(self.bpmgr.bplist.keys()):
             (bp, clear_bp) = self.bpmgr.find_bp(filename, frame.f_lineno, frame)
             if bp:
+                if bp.offset is not None and bp.offset != frame.f_lasti:
+                    # print(f"XXXX core: have breakpoint, but offsets mismatch {bp.offset} vs {frame.f_lasti}")
+                    return False
+
                 self.current_bp = bp
                 if clear_bp and bp.temporary:
                     msg = "temporary "

trepan/processor/cmdbreak.py

@@ -36,6 +36,7 @@ def set_break(
     force=False,
     offset=None,
 ):
+
     if line_number is None and offset is None:
         part1 = f"""I don't understand '{" ".join(args[1:])}' as a line number, offset, or function name"""
         msg = wrapped_lines(

…n/processor/command/info_subcmd/break.py …essor/command/info_subcmd/breakpoints.pytrepan/processor/command/info_subcmd/break.py renamed to trepan/processor/command/info_subcmd/breakpoints.py trepan/processor/command/info_subcmd/break.py renamed to trepan/processor/command/info_subcmd/breakpoints.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2009, 2012-2013, 2015, 2018, 2024
+#   Copyright (C) 2009, 2012-2013, 2015, 2018, 2024, 2026
 #   Rocky Bernstein <[email protected]>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 from trepan.processor.command import base_subcmd as Mbase_subcmd
 
 
-class InfoBreak(Mbase_subcmd.DebuggerSubcommand):
+class InfoBreakpoints(Mbase_subcmd.DebuggerSubcommand):
     """**info breakpoints** [ *bp-number...* ]
 
     Show the status of specified breakpoints (or all user-settable
@@ -55,10 +55,9 @@ class InfoBreak(Mbase_subcmd.DebuggerSubcommand):
 
     """
 
-    min_abbrev = len("b")
+    min_abbrev = len("br")
     need_stack = False
     short_help = "Status of user-settable breakpoints"
-
     complete = complete_bpnumber
 
     def bpprint(self, bp):
@@ -79,13 +78,26 @@ def bpprint(self, bp):
             column_str = ""
         if bp.offset is None:
             self.msg(
-                "%-4dbreakpoint    %s     at %s:%d%s"
-                % (bp.number, disp, self.core.filename(bp.filename), bp.line_number, column_str)
+                "%-4dbreakpoint    %s  any at %s:%d%s"
+                % (
+                    bp.number,
+                    disp,
+                    self.core.filename(bp.filename),
+                    bp.line_number,
+                    column_str,
+                )
             )
         else:
             self.msg(
                 "%-4dbreakpoint    %s %4s at %s:%d%s"
-                % (bp.number, disp, "*"+str(bp.offset), self.core.filename(bp.filename), bp.line_number, column_str)
+                % (
+                    bp.number,
+                    disp,
+                    "*" + str(bp.offset),
+                    self.core.filename(bp.filename),
+                    bp.line_number,
+                    column_str,
+                )
             )
         if bp.condition:
             self.msg(f"\tstop only if {bp.condition}")

trepan/processor/location.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2017, 2020, 2023-2024 Rocky Bernstein
+#  Copyright (C) 2017, 2020, 2023-2024, 2026 Rocky Bernstein
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
@@ -98,7 +98,9 @@ def resolve_location(proc, location) -> Optional[Location]:
                 # trepan-xpy() which has it's own type of compatible
                 # Function, that would fail an `inspect.isfunction()`
                 # test.
-                if hasattr(mod_or_func_or_code, "__code__") or hasattr(mod_or_func_or_code, "im_func"):
+                if hasattr(mod_or_func_or_code, "__code__") or hasattr(
+                    mod_or_func_or_code, "im_func"
+                ):
                     offset = -1
                 else:
                     proc.errmsg(msg)
@@ -129,14 +131,18 @@ def resolve_location(proc, location) -> Optional[Location]:
             is_address = location.is_address
             if inspect.ismodule(mod_or_func_or_code):
                 if hasattr(mod_or_func_or_code, "__file__"):
-                    filename = pyficache.resolve_name_to_path(mod_or_func_or_code.__file__)
+                    filename = pyficache.resolve_name_to_path(
+                        mod_or_func_or_code.__file__
+                    )
                     filename = proc.core.canonic(filename)
                     if not lineno:
                         # use first line of module file
                         lineno = 1
                         offset = 0
                         is_address = False
-                    return Location(filename, lineno, is_address, mod_or_func_or_code, offset)
+                    return Location(
+                        filename, lineno, is_address, mod_or_func_or_code, offset
+                    )
                 else:
                     msg = f"module '{location.path}' doesn't have a file associated with it"
 
@@ -159,7 +165,6 @@ def resolve_location(proc, location) -> Optional[Location]:
             else:
                 return INVALID_LOCATION
 
-
     elif location.line_number:
         if curframe is None:
             proc.errmsg("Current frame is not set")
@@ -169,14 +174,37 @@ def resolve_location(proc, location) -> Optional[Location]:
         is_address = location.is_address
         mod_or_func_or_code = curframe.f_code
         if offset is None:
-            code_info, lineinfo = pyficache.code_line_info(filename, lineno, include_offsets=True)
+            code_info, lineinfo = pyficache.code_line_info(
+                filename, lineno, include_offsets=True
+            )
             if lineinfo:
-                offset = lineinfo[0].offsets[0]
-                mod_or_func_or_code_name = lineinfo[0].name
-                if mod_or_func_or_code.co_name != mod_or_func_or_code_name:
-                    # Breakpoint is in a nested function/method.
-                    # Get new code object
-                    mod_or_func_or_code = code_info.get(mod_or_func_or_code_name, mod_or_func_or_code)
+                if location.offset is not None:
+                    # Find the more specific offset.
+                    desired_offset = location.offset
+                    for linegroup in lineinfo:
+                        offset = next(
+                            (
+                                try_offset
+                                for try_offset in linegroup.offsets
+                                if try_offset == desired_offset
+                            ),
+                            None
+                        )
+                        if offset is not None:
+                            break
+                        pass
+                    else:
+                        offset = lineinfo[0].offsets[0]
+                        proc.msg("Offset %d not found for line %d; using offset %d instead." %
+                                 (location.offset, location.line_number, offset))
+
+                    mod_or_func_or_code_name = lineinfo[0].name
+                    if mod_or_func_or_code.co_name != mod_or_func_or_code_name:
+                        # Breakpoint is in a nested function/method.
+                        # Get new code object
+                        mod_or_func_or_code = code_info.get(
+                            mod_or_func_or_code_name, mod_or_func_or_code
+                        )
                 pass
             else:
                 return INVALID_LOCATION
@@ -227,7 +255,9 @@ def resolve_address_location(proc, location) -> Optional[Location]:
 
         try:
             # Check if the converted string is a function or instance method
-            if inspect.isfunction(mod_or_func_or_code) or hasattr(mod_or_func_or_code, "im_func"):
+            if inspect.isfunction(mod_or_func_or_code) or hasattr(
+                mod_or_func_or_code, "im_func"
+            ):
                 pass
             else:
                 proc.errmsg(msg)
@@ -257,13 +287,17 @@ def resolve_address_location(proc, location) -> Optional[Location]:
             is_address = location.is_address
             if inspect.ismodule(mod_or_func_or_code):
                 if hasattr(mod_or_func_or_code, "__file__"):
-                    filename = pyficache.resolve_name_to_path(mod_or_func_or_code.__file__)
+                    filename = pyficache.resolve_name_to_path(
+                        mod_or_func_or_code.__file__
+                    )
                     filename = proc.core.canonic(filename)
                     if not offset:
                         # use first offset of module file
                         offset = 0
                         is_address = True
-                    return Location(filename, offset, is_address, mod_or_func_or_code, offset)
+                    return Location(
+                        filename, offset, is_address, mod_or_func_or_code, offset
+                    )
                 else:
                     msg = f"module '{location.path}' doesn't have a file associated with it"
 
@@ -304,6 +338,9 @@ def resolve_address_location(proc, location) -> Optional[Location]:
     cmdproc = CommandProcessor(d.core)
     frame = cmdproc.frame = sys._getframe()
     cmdproc.setup()
+    location = Location(__file__, 2, False, None, None)
+    assert resolve_location(cmdproc, location) == INVALID_LOCATION
+
     location = Location(__file__, frame.f_lineno, False, None, frame.f_lasti)
     print(resolve_location(cmdproc, location))
     location = Location(__file__, None, False, "resolve_location", frame.f_lasti)