From c4c1a3dd3f4dc0e3116ede6e509f7f1f5f05b00f Mon Sep 17 00:00:00 2001 From: Brad Elkin Date: Fri, 18 Dec 2020 23:32:40 -0500 Subject: [PATCH] Fix the return tuples for parse_break_cmd looks like a couple of modules were missed when you added the offset to the returned tuple for parse_break_cmd the returned tuples in continue.py and tbreak.py are misssing offset the returned tuples in break.py and line.py are ok. causes commands like "c 20" to fail when I use trepan3k 1.2.0 --- trepan/processor/command/continue.py | 2 +- trepan/processor/command/tbreak.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trepan/processor/command/continue.py b/trepan/processor/command/continue.py index 5ebf5844..aa006f10 100644 --- a/trepan/processor/command/continue.py +++ b/trepan/processor/command/continue.py @@ -52,7 +52,7 @@ class ContinueCommand(DebuggerCommand): def run(self, args): if len(args) > 1: # FIXME: DRY this code. Better is to hook into tbreak. - func, filename, lineno, condition = parse_break_cmd(self.proc, args) + func, filename, lineno, condition, offset = parse_break_cmd(self.proc, args) if not set_break(self, func, filename, lineno, condition, True, args): return False self.core.step_events = None # All events diff --git a/trepan/processor/command/tbreak.py b/trepan/processor/command/tbreak.py index 7fdda71a..16e85fd2 100644 --- a/trepan/processor/command/tbreak.py +++ b/trepan/processor/command/tbreak.py @@ -66,7 +66,7 @@ class TempBreakCommand(DebuggerCommand): complete = complete_break_linenumber def run(self, args): - func, filename, lineno, condition = parse_break_cmd(self.proc, args) + func, filename, lineno, condition, offset = parse_break_cmd(self.proc, args) if not (func == None and filename == None): set_break(self, func, filename, lineno, condition, True, args)