fixing endless loop bug

[pygdb.git] / GdbTerminal.py

diff --git a/GdbTerminal.py b/GdbTerminal.py
index ff6dc6b37356133c8d526fbb1f02f9f0dd6c9d3a..af0368bdcaa670154ab2ca9d49ebd71c4178a64c 100644 (file)
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -36,6 +36,22 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
        def setStepin(self):
                self.feed_child("step\n");
 
+       def setStepout(self):
+               bt = self.getBacktrace()
+
+               if len(bt) < 2:
+                       self.setContinue()
+
+               else:
+                       #Get the second line
+                       sec = bt[1]
+
+                       #Check if it is a backtrace line
+                       if re.compile("^#1\s+.*\s\S+:\d+$").search(sec):
+                               pos = string.split(sec)[-1]
+                               self.feed_child("advance %s\n" % pos)
+
+
        def setQuit(self):
                self.feed_child("quit\n")
                self.waitForNewline()
@@ -43,9 +59,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
        def setPty(self, pty):
                ttyname = os.ttyname(pty)
-               len = self.getHistoryLen()
-               self.feed_child("set inferior-tty %s\n" % (ttyname,))
-               self.waitForPrompt(len)
+               self.__getAnswerFromCmd("set inferior-tty %s\n" % (ttyname,))
 
        def setBreakpoint(self, file, lineno, condition=None):
                his = self.getHistoryLen()
@@ -74,22 +88,18 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
        def delBreakpoint(self, breakpoint):
-               his = self.getHistoryLen()
-               self.feed_child("del breakpoint %s\n" % (breakpoint,))
-               self.waitForPrompt(his)
+               self.__getAnswerFromCmd("del breakpoint %s\n" % (breakpoint,))
+
 
        def getBreakpoints(self):
-               starthis = self.getHistoryLen()
-               self.feed_child("info breakpoints\n")
-               endhis, response = self.waitForPrompt(starthis)
+               bplines = self.__getAnswerFromCmd("info breakpoints\n")
 
                rxbp = re.compile("^\d+\s+breakpoint")
-               rxpos = re.compile("^.* at \S+:\d+$")
-               rxcond = re.compile("^\tstop only if")
+               rxpos = re.compile("^.*at \S+:\d+$")
+               rxcond = re.compile("^\s+stop only if")
 
                bpnts = []
-               bplines = self.history[starthis+1:endhis]
-               i = 0
+               i = 1
 
                #Parse the resulting lines
                while i<len(bplines):
@@ -103,13 +113,18 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                        no = string.split(line)[0]
 
                        #This line does not contain the file!
+                       #Check for next line...
+                       if not rxpos.search(line):
+                               i += 1
                        if not rxpos.search(line):
+                               i += 1
                                continue
 
                        pos = string.split(line)[-1]
                        [file,lineno] = string.split(pos,":")
                        cond = None
 
+                       #Look for conditions
                        if i+1<len(bplines) and rxcond.search(bplines[i+1]):
                                i +=1
                                line = bplines[i]
@@ -124,11 +139,8 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
        def getExpression(self, expr):
-
-               his = self.getHistoryLen()
-               self.feed_child("print " + expr + "\n")
-               his, response = self.waitForPrompt(his)
-               answer = self.history[his-1]
+               answer = self.__getAnswerFromCmd("print " + expr + "\n")
+               answer = answer[-1]
 
                if len(string.split(answer, "=")) == 1:
                        return answer.strip()
@@ -138,18 +150,22 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
        
        def listCodeSnippet(self):
-               starthis = self.getHistoryLen()
-               self.feed_child("list\n")
-               endhis, response = self.waitForPrompt(starthis)
-
-               text = string.join(self.history[starthis:endhis], "\n")
-               return text
+               return self.__getAnswerFromCmd("list\n")
 
+       def getBacktrace(self):
+               return self.__getAnswerFromCmd("bt\n")
 
        def waitForPrompt(self, his):
                rx = "^\(gdb\)"
                return self.waitForRx(rx,his)
 
+       def __getAnswerFromCmd(self, cmd):
+               starthis = self.getHistoryLen()
+               self.feed_child(cmd)
+               endhis, response = self.waitForPrompt(starthis)
+
+               return self.history[starthis:endhis]
+
 
        def testForActivity(self, his):
                """Test whether debugger got active again"""
@@ -189,10 +205,12 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                        return "continued", None
 
                if string.find(line, "\x1a\x1a") == 0:
-                       rxcont = re.compile("^\(gdb\)\s+(cont|step|next|stepi|nexti)")
+                       rxcont = re.compile("^\(gdb\)\s+(cont|step|next|stepi|nexti|advance)")
 
                        if rxcont.search(self.history[his-1]):
                                return "stepped", None
+                       if rxcont.search(self.history[his-2]):
+                               return "stepped", None
 
                return None