Add warn class. Warn suspicious jump command

Author: rocky

test/functional/test_skip.py

@@ -31,7 +31,8 @@ def test_skip():
     out = [
         "-- x = 3",
         "-- x = 4",
-        "-- y = 5"
+        "-- y = 5",
+        "-- y = 7  # NOQA"
     ]
     compare_output(out, d)
     assert x == 3, "should have skipped x=4"
@@ -51,6 +52,7 @@ def test_skip():
         "-- x = 7",
         "-- x = 8",
         "-- y = 10  # NOQA",
+        '-- d.core.stop(options={"remove": True})',
     ]  # x = 8 is shown in prompt, but not run.
     compare_output(out, d)
     assert x == 7, "x = 8..9 should have been skipped"

trepan/bwprocessor/command/base_cmd.py

@@ -89,6 +89,15 @@ def run(self, args):
         """
         raise NotImplementedError(NotImplementedMessage)
 
+    def warnmsg(self, msg, opts={}):
+        """Convenience short-hand for self.debugger.intf.warnmsg"""
+        try:
+            return self.debugger.intf[-1].warnmsg(msg)
+        except EOFError:
+            # FIXME: what do we do here?
+            pass
+        return None
+
     pass
 
 

trepan/bwprocessor/command/mock.py

@@ -57,6 +57,10 @@ def msg_nocr(self, msg):
         sys.stdout.write(msg)
         return
 
+    def warnsg(self, msg):
+        print("** %s" % msg)
+        return
+
     pass
 
 

trepan/interfaces/user.py

@@ -169,6 +169,10 @@ def readline(self, prompt=""):
             pass
         return self.input.readline(prompt=prompt)
 
+    def warnmsg(self, msg, prefix="* "):
+        """Common routine for reporting debugger warning messages."""
+        return self.msg("%s%s" % (prefix, msg))
+
     pass
 
 

trepan/processor/command/base_cmd.py

@@ -125,6 +125,15 @@ def run(self, args):
         """
         raise NotImplementedError(NotImplementedMessage)
 
+    def warnmsg(self, msg, opts={}):
+        """Convenience short-hand for self.debugger.intf[-1].warnmsg"""
+        try:
+            return self.debugger.intf[-1].warnmsg(msg, prefix="*Warning*: ")
+        except EOFError:
+            # FIXME: what do we do here?
+            pass
+        return None
+
     pass
 
     def section(self, message, opts={}):

trepan/processor/command/base_subcmd.py

@@ -138,6 +138,10 @@ def section(self, message, opts={}):
 
     pass
 
+    def warnmsg(self, msg):
+        """Convenience short-hand for self.debugger.intf[-1].warnmsg"""
+        return self.debugger.intf[-1].warnmsg(msg, prefix="*Warning*: ")
+
 
 class DebuggerSetBoolSubcommand(DebuggerSubcommand):
     max_args = 1

trepan/processor/command/jump.py

@@ -16,8 +16,9 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import inspect
 import os
+from dis import findlinestarts
 
-from trepan.processor import cmdproc as Mcmdproc
+from trepan.processor.cmdproc import print_location
 
 # Our local modules
 from trepan.processor.command.base_cmd import DebuggerCommand
@@ -81,6 +82,11 @@ def run(self, args):
 
         if lineno is None:
             return False
+
+        linestarts = dict(findlinestarts(self.proc.curframe.f_code))
+        if lineno not in linestarts.values():
+            self.warnmsg(f"code for line {lineno} not found. Results may be unpredictable.")
+
         try:
             # Set to change position, update our copy of the stack,
             # and display the new position
@@ -89,24 +95,25 @@ def run(self, args):
                 self.proc.stack[self.proc.curindex][0],
                 lineno,
             )
-            Mcmdproc.print_location(self.proc)
+            print_location(self.proc)
         except ValueError as e:
-            self.errmsg("jump failed: %s" % e)
+            self.errmsg(f"jump failed: {e}")
         return False
 
     pass
 
 
 if __name__ == "__main__":
     from trepan.processor.command import mock
+    from trepan.processor.cmdproc import get_stack
 
     d, cp = mock.dbg_setup()
     command = JumpCommand(cp)
     print("jump when not running: ", command.run(["jump", "1"]))
     command.core.execution_status = "Running"
     cp.curframe = inspect.currentframe()
     cp.curindex = 0
-    cp.stack = Mcmdproc.get_stack(cp.curframe, None, None)
+    cp.stack = get_stack(cp.curframe, None, None)
     command.run(["jump", "1"])
     cp.curindex = len(cp.stack) - 1
     command.run(["jump", "1"])

trepan/processor/command/mock.py

@@ -68,6 +68,10 @@ def msg_nocr(self, msg):
         sys.stdout.write(msg)
         return
 
+    def warnmsg(self, msg):
+        print("* %s" % msg)
+        return
+
     pass
 
 

trepan/processor/command/skip.py

@@ -74,6 +74,7 @@ def run(self, args):
                 lineno,
             )
             print_location(self.proc)
+            self.proc.continue_running = True  # Break out of command read loop
         except ValueError as e:
             self.errmsg(f"skip failed: {e}")
         return False

trepan/vprocessor.py

@@ -81,4 +81,10 @@ def section(self, message, opts={}):
     def settings(self, setting):
         return self.core.debugger.settings.get(setting)
 
+    def warnrmsg(self, message, opts={}):
+        """Convenience short-hand for self.intf[-1].warnmsg"""
+        if "plain" != self.debugger.settings["highlight"]:
+            message = colorize("standout", message)
+            pass
+        return self.intf[-1].warnmsg(message)
     pass