Go over brpt offset interpretation.

Also some cleanup added.

Author: rocky

trepan/__main__.py

@@ -74,7 +74,7 @@ def main(dbg=None, sys_argv=list(sys.argv)):
 
     if dbg is None:
         dbg = trepan.debugger_obj = Trepan(dbg_opts)
-        dbg.core.add_ignore(main)
+        dbg.core.add_ignore(main, trepan.api.debug)
 
     postprocess_options(dbg, opts)
 
@@ -316,6 +316,8 @@ def write_wrapper(*args, **kwargs):
             break
         except DebuggerRestart:
             dbg.core.execution_status = "Restart requested"
+            # for debug:
+            # dbg.core.execution_status = "Running"
             if dbg.program_sys_argv:
                 sys.argv = list(dbg.program_sys_argv)
                 part1 = f"Restarting {dbg.core.filename(mainpyfile)} with arguments:"

trepan/api.py

@@ -187,6 +187,7 @@ def debug(
     code = frame.f_code
     filename = code.co_filename
     line_number = frame.f_lineno
+    last_i = frame.f_lasti
 
     bp = bpmgr.find_breakpoint(filename, line_number)
     if bp is None:
@@ -199,14 +200,16 @@ def debug(
                 code = frame.f_code
                 filename = code.co_filename
                 line_number = frame.f_lineno
+                last_i = frame.f_lasti
 
         bp = core.bpmgr.add_breakpoint(
             filename=filename,
             line_number=line_number,
             is_code_offset=False,
             condition=None,
             func_or_code=code,
-            is_breakpoint_call=True
+            is_breakpoint_call=True,
+            offset=last_i,
         )
     elif not bp.enabled:
         core.step_ignore = -1

trepan/lib/breakpoint.py

@@ -37,7 +37,7 @@ class Breakpoint:
     how many times the breakpoint was hit,
     whether it is disabled, or has a condition associated with the breakpoint.
 
-    If is_code_offset is True, position is a code offset. Otherwise, it
+    If attribute is_code_offset is True, position is a code offset. Otherwise, it
     is a 0-origin column offset.
 
     The code offset for start of a method, module, or function is always 0.
@@ -50,6 +50,12 @@ class Breakpoint:
 
     To do this, we need deep undertanding of Python code objects, which we get
     from pyficache.
+
+    Attribute offset is the code offset, when is_code_offset is true, it is ignored and
+    should be the same value as position. However when is_code_offset is False, then
+    we have a line or line/column position. Here offset can be the code offset when there
+    is a unique value, but since line or line/column might have many offsets associated with them,
+    the sentinal value -1 is used to indicate any possible offset.
     """
 
     def __init__(
@@ -62,7 +68,8 @@ def __init__(
         code: Optional[CodeType] = None,
         position: Optional[int] = None,
         is_code_offset: bool = True,
-        is_breakpoint_call: bool = False
+        is_breakpoint_call: bool = False,
+        offset: int = -1 # default is any possible code offset
     ):
         # FIXME: split out this top part into a part that fills out information
         if code is not None:
@@ -101,8 +108,7 @@ def __init__(
             pass
         else:
             self.column = position
-            # TODO: Figure out code offset.
-            self.offset = None
+            self.offset = offset
 
         self.condition = condition
         self.enabled = True
@@ -251,6 +257,7 @@ def add_breakpoint(
         condition: Optional[str] = None,
         func_or_code=None,
         is_breakpoint_call: bool = False,
+        offset: int =  -1 # default is any possible code offset
     ):
         """
         Add a breakpoint in ``filename`` at line number ``line_number``.
@@ -313,6 +320,7 @@ def add_breakpoint(
             position,
             is_code_offset,
             is_breakpoint_call,
+            offset,
         )
 
         # Build the internal lists of breakpoints
@@ -498,8 +506,13 @@ def needs_no_tracing(self) -> bool:
         support, i.e. they are handled either by explicit breakpoint() calls
         or the newer debug protocal handles the breakpoints
         """
-        # return len(self.bplist) == 0
-        return all(not getattr(item, 'is_breakpoint_call', False) for item in self.bplist)
+        for bp_list in self.bplist.values():
+            for bp in bp_list:
+                if hasattr(bp, "is_breakpoint_call") and not bp.is_breakpoint_call:
+                    # print(f"XXX0 {bp} needs tracing")
+                    return False
+        # print(f"XXX does not need tracing")
+        return True
 
     def last(self):
         return len(self.bpbynumber) - 1

trepan/lib/core.py

@@ -30,7 +30,7 @@
 import sys
 import threading
 from types import FrameType
-from typing import Any, Dict, NewType, Optional
+from typing import Any, Optional
 
 # External packages
 import pyficache
@@ -45,9 +45,7 @@
 from trepan.processor.cmdproc import CommandProcessor
 from trepan.processor.trace import PrintProcessor
 
-InitOptions = NewType("InitOptions", Dict[str, Any])
-
-DEFAULT_INIT_OPTS: InitOptions = {
+DEFAULT_INIT_OPTS: dict[str, Any] = {
     "processor": None,
     # How many step events to skip before
     # entering event processor? Zero (0) means stop at the next one.
@@ -58,7 +56,7 @@
 
 
 class TrepanCore:
-    def __init__(self, debugger, opts: InitOptions = DEFAULT_INIT_OPTS):
+    def __init__(self, debugger, opts = DEFAULT_INIT_OPTS):
         """Create a debugger object. But depending on the value of
         key 'start' inside hash `opts', we may or may not initially
         start tracing events (i.e. enter the debugger).
@@ -232,7 +230,7 @@ def remove_ignore(self, frame_or_fn):
         be debugged"""
         return self.ignore_filter.remove(frame_or_fn)
 
-    def start(self, opts: InitOptions = DEFAULT_INIT_OPTS):
+    def start(self, opts = DEFAULT_INIT_OPTS):
         """We've already created a debugger object, but here we start
         debugging in earnest. We can also turn off debugging (but have
         the hooks suspended or not) using 'stop'.

trepan/processor/cmdproc.py

@@ -592,7 +592,7 @@ def process_commands(self):
             pass
         run_hooks(self, self.postcmd_hooks)
         if self.fast_continue:
-            if self.core.bpmgr.needs_no_tracing:
+            if self.core.bpmgr.needs_no_tracing():
                 # Remove tracing on frames and remove trace hook.
                 frame = self.curframe
                 while frame:

trepan/processor/command/info_subcmd/breakpoints.py

@@ -78,7 +78,8 @@ def bpprint(self, bp):
         else:
             column_str = ""
         brkpt_type = "breakpoint()" if bp.is_breakpoint_call else "breakpoint"
-        if bp.offset is None:
+        if bp.offset == -1:
+            # We have a line or line/number offset, so any offset matches.
             self.msg(
                 "%-4d%-12s  %s  any at %s:%d%s"
                 % (

trepan/processor/command/run.py

@@ -39,6 +39,11 @@ class RunCommand(DebuggerCommand):
     DebuggerCommand.setup(locals(), category="support", max_args=0)
 
     def run(self, args):
+        # The below is a hack.
+        # If for some reason we trace into this code,
+        # setting "execution_status" to "Running" will allow
+        # us to step or continue runningt the code.
+        self.core.execution_status = "Running"
         confirmed = False
         if len(args) <= 1:
             if "!" != args[0][-1]: