Add LICENSE
[pygdb.git] / GdbTerminal.py
old mode 100755 (executable)
new mode 100644 (file)
index 5e6ba6d..58c3bbe
@@ -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,62 +88,62 @@ 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
 
-               #Parse the resulting lines
-               while i<len(bplines):
-                       line = bplines[i]
+               try:
+                       i = 1
 
-                       if not rxbp.search(line):
-                               i += 1
-                               continue
-       
-                       #Get number of breakpoint
-                       no = string.split(line)[0]
-
-                       #This line does not contain the file!
-                       if not rxpos.search(line):
-                               i += 1
-                               line = bplines[i]
+                       #Parse the resulting lines
+                       while i<len(bplines):
 
-                       pos = string.split(line)[-1]
-                       [file,lineno] = string.split(pos,":")
-                       cond = None
-
-                       if i+1<len(bplines) and rxcond.search(bplines[i+1]):
-                               i +=1
                                line = bplines[i]
-                               pre,cond = string.split(line,"if")
-                               cond = cond.strip()
+                               while not rxbp.search(line):
+                                       i += 1
+                                       line = bplines[i]
+               
+                               #Get number of breakpoint
+                               no = string.split(line)[0]
+
+                               #This line does not contain the file!
+                               #Check for next line...
+                               while not rxpos.search(line):
+                                       i += 1
+                                       line = bplines[i]
+
+                               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]
+                                       cond = string.join(string.split(line," if ")[1:], " if ")
+                                       cond = cond.strip()
+
+                               bpnts += [[no, file, lineno, cond]]
+                               i += 1
 
-                       bpnts += [[no, file, lineno, cond]]
-                       i += 1
+               except IndexError:
+                       pass
 
                return bpnts
                
 
 
        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()
@@ -139,18 +153,67 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
        
        def listCodeSnippet(self):
-               starthis = self.getHistoryLen()
-               self.feed_child("list\n")
-               endhis, response = self.waitForPrompt(starthis)
+               return self.__getAnswerFromCmd("list\n")
+
+       def getBacktrace(self):
+
+               stack = []
+               answ = self.__getAnswerFromCmd("bt\n")
+
+               rxstartfull = re.compile("^\#\d+\s+0x[0-9a-f]+\s+in\s+\S+\s+\(")
+               rxstartshort = re.compile("^\#\d+\s+\S+\s+\(")
+               rxpos = re.compile("at \S+:\d+$")
+
+               try:
+
+                       i=0
+                       while i<len(answ):
+                               line = answ[i]
+
+                               while not rxstartfull.search(line) and not rxstartshort.search(line):
+                                       print "Warning: '", line, "' does not match bt entry."
+                                       i+=1
+                                       line = answ[i]
+
+                               parts = line.split()
+
+                               if rxstartfull.search(line):
+                                       func = parts[3]
+                                       addr = parts[1]
+                               else:
+                                       func = parts[1]
+                                       addr = None
+
 
-               text = string.join(self.history[starthis:endhis], "\n")
-               return text
+                               #Search for file position
+                               while not rxpos.search(line):
+                                       i+=1
+                                       line = answ[i]
 
+                               parts = line.split()
+                               pos = parts[-1]
+                               [file,lineno] = pos.split(":")
+
+                               stack += [[addr,func,file,lineno]]
+
+                               i+=1
+
+               except IndexError:
+                       pass
+
+               return stack
 
        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"""
@@ -164,11 +227,14 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
                if string.find(line, "Program exited") == 0:
                        code = string.split(line)[-1]
-                       code = code[1:-1]
 
                        codeno = 0
-                       for c in code:
-                               codeno = codeno*8 + int(c)
+               
+                       #Parse the octal number
+                       if code[0] == "O":
+                               code = code[1:-1]
+                               for c in code:
+                                       codeno = codeno*8 + int(c)
 
                        return "exited", codeno
 
@@ -187,10 +253,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