Improve stepi

Correct resetting opcode tracing when going from stepi to step or next
Respect set-different behavior when going from line event to opcode

Author: rocky

trepan/lib/core.py

@@ -116,8 +116,9 @@ def get_option(key: str) -> Any:
         self.stop_on_finish = False
 
         self.last_lineno = None
+        self.last_offset = None
         self.last_filename = None
-        self.different_line = None
+        self.different_line = True
 
         # The reason we have stopped, e.g. 'breakpoint hit', 'next',
         # 'finish', 'step', or 'exception'.
@@ -344,7 +345,7 @@ def matches_condition(self, frame):
         return val
 
     def is_stop_here(self, frame, event):
-        """Does the magic to determine if we stop here and run a
+        """Do the magic to determine if we stop here and run a
         command processor or not. If so, return True and set
         self.stop_reason; if not, return False.
 
@@ -362,13 +363,16 @@ def is_stop_here(self, frame, event):
         # Do we want a different line and if so,
         # do we have one?
         lineno = frame.f_lineno
+        offset = frame.f_lasti
         filename = frame.f_code.co_filename
-        if self.different_line and event == "line":
+        if self.different_line and event in ("line", "opcode"):
             if self.last_lineno == lineno and self.last_filename == filename:
-                # print("is_stop_here(): not different")
-                return False
+                if event != "opcode" or self.last_offset == offset:
+                    # print("is_stop_here(): not different")
+                    return False
             pass
         self.last_lineno = lineno
+        self.last_offset = offset
         self.last_filename = filename
 
         if self.stop_level is not None:

trepan/processor/command/next.py

@@ -59,6 +59,8 @@ def run(self, args):
         self.core.different_line = want_different_line(
             args[0], self.debugger.settings["different"]
         )
+        if self.proc.frame is not None:
+            self.proc.frame.f_trace_opcodes = False
         self.core.set_next(self.proc.frame, step_ignore)
         self.proc.continue_running = True  # Break out of command read loop
         return True

trepan/processor/command/step.py

@@ -125,6 +125,8 @@ def run(self, args):
         self.core.different_line = want_different_line(
             args[0], self.settings["different"]
         )
+        if self.proc.frame is not None:
+            self.proc.frame.f_trace_opcodes = False
         self.core.stop_level = None
         self.core.last_frame = None
         self.core.stop_on_finish = False

trepan/processor/command/stepi.py

@@ -67,7 +67,6 @@ def run(self, args):
 
         self.core.step_events = None
 
-        self.core.different_line = False
         # print("XXX", self.proc.frame)
         if self.proc.frame is not None:
             self.proc.frame.f_trace_opcodes = True

trepan/processor/print.py

@@ -302,7 +302,7 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
         is_pyasm = pyficache.is_python_assembly_file(remapped_file or filename)
         if is_pyasm:
             line, remapped_line_number = pyficache.get_pyasm_line(
-                filename, line_number, is_source_line=True
+                filename, line_number, is_source_line=True, offset=frame.f_lasti,
             )
             if remapped_line_number >= 0:
                 # FIXME: +1 is because getlines is 0 origin.