changed some stuff of active/inactive detection
[pygdb.git] / GdbTerminal.py
index 12256c1d0066e73b4d1f80dc69afbceae38f1cc8..15cb11df2bb233c8c7881db3e2c255cf0de77327 100755 (executable)
@@ -25,62 +25,182 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
        def setPty(self, pty):
                ttyname = os.ttyname(pty)
-               self.feed_dbg("set inferior-tty %s\n" % (ttyname,))
+               self.feed_child("set inferior-tty %s\n" % (ttyname,))
 
        def setRun(self):
-
-               his = self.getHistoryLen()
                argv = string.join(string.split(self.clientCmd)[1:])
-               self.feed_dbg("run " + argv + "\n")
-               return self.waitForPosition(his)
-
+               self.feed_child("run " + argv + "\n")
 
        def setContinue(self):
-               his = self.getHistoryLen()
-               self.feed_dbg("cont\n");
-               return self.waitForPosition(his)
+               self.feed_child("cont\n");
 
        def setStepover(self):
-               his = self.getHistoryLen()
-               self.feed_dbg("next\n");
-               return self.waitForPosition(his)
+               self.feed_child("next\n");
 
        def setStepin(self):
-               his = self.getHistoryLen()
-               self.feed_dbg("step\n");
-               return self.waitForPosition(his)
+               self.feed_child("step\n");
 
        def setQuit(self):
-               self.feed_dbg("quit\n")
+               self.feed_child("quit\n")
                self.waitForNewline()
-               self.feed_dbg("y\n");
+               self.feed_child("y\n");
+
+       def setBreakpoint(self, file, lineno, condition=None):
+               his = self.getHistoryLen()
+               if condition==None:
+                       self.feed_child("break %s:%s\n" % (file, str(lineno)))
+               else:
+                       self.feed_child("break %s:%s if %s\n" % \
+                                       (file, str(lineno), condition))
+
+               rx = re.compile("^Breakpoint |^No |^\(gdb\) ")
+               his, response = self.waitForRx(rx, his)
+
+               answer = None
+
+               if response[0:10] == "Breakpoint":
+                       answer = string.split(response)[1].strip()
+               
+               #Wants an answer: "No"
+               if response[0:14] == "No source file":
+                       self.feed_child("n\n");
+
+               #Wait again for (gdb)...
+               self.waitForActivation(his)
+
+               return answer
+
+
+       def delBreakpoint(self, breakpoint):
+               his = self.getHistoryLen()
+               self.feed_child("del breakpoint %s\n" % (breakpoint,))
+               self.waitForActivation(his)
+
+       def getBreakpoints(self):
+               starthis = self.getHistoryLen()
+               self.feed_child("info breakpoints\n")
+               endhis, response = self.__waitForPrompt(starthis)
+
+               rxbp = re.compile("^\d+\s+breakpoint")
+               rxpos = re.compile("^.* at \S+:\d+$")
+               rxcond = re.compile("^\tstop only if")
+
+               bpnts = []
+               bplines = self.history[starthis+1:endhis]
+               i = 0
+
+               #Parse the resulting lines
+               while i<len(bplines):
+                       line = bplines[i]
+
+                       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]
+
+                       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()
+
+                       bpnts += [[no, file, lineno, cond]]
+                       i += 1
+
+               return bpnts
+               
 
-       def setBreakpoint(self, file, lineno):
-               self.feed_dbg("break %s:%d\n" % (file, lineno))
 
        def getExpression(self, expr):
 
                his = self.getHistoryLen()
-               self.feed_dbg("print " + expr + "\n")
+               self.feed_child("print " + expr + "\n")
+               his, response = self.__waitForPrompt(his)
+               answer = self.history[his-1]
 
-               rx = re.compile("^\$[1-9][0-9]* = .*$")
-               his, response = self.waitForRx(rx, his)
+               if len(string.split(answer, "=")) == 1:
+                       return answer.strip()
 
-               split = string.split(response, "=")
+               split = string.split(answer, "=")
                return string.join(split[1:], "=").strip()
 
 
-       def waitForPosition(self, his):
-               rx = re.compile("^\(gdb\) $")
-               his, reponse = self.waitForRx(rx,his)
+       def waitForActivation(self, starthis):
 
-               if self.history[his-1][0:2]=="\x1a\x1a":
-                       tuples = string.split(self.history[his-1][2:], ":")
-                       return tuples[0:2]
+               self.setActive(False)
+               endhis, response = self.__waitForPrompt(starthis)
+               self.setActive(True)
+
+               for his in reversed(range(starthis+1,endhis)):
+                       if self.history[his][0:2]=="\x1a\x1a":
+                               tuples = string.split(self.history[his][2:], ":")
+                               return tuples[0], int(tuples[1])
 
                return None
 
 
+       def __waitForPrompt(self, his):
+               rx = re.compile("^\(gdb\) ")
+               return self.waitForRx(rx,his)
+
+
+       def testForActivity(self, his):
+               """Test whether debugger got active again"""
+               rx = re.compile("^\(gdb\) ")
+
+               #Aha! There is a prompt...
+               if rx.search(self.history[his]):
+                       line = self.history[his-1]
+
+                       if line[0:2]=="\x1a\x1a":
+                               tuples = string.split(line[2:], ":")
+                               tuples[1] = int(tuples[1])
+                               return "break", [tuples[0], int(tuples[1])]
+
+                       if string.find(line, "Program exited") == 0:
+                               code = string.split(line)[-1]
+                               code = code[:-1]
+                               return "exited", code
+
+               return None
+
+
+       def testForInactivity(self, his):
+               """Test whether debugger got inactive"""                
+               line = self.history[his]
+
+               if string.find(line, "Starting program:") == 0:
+                       prog = string.join( string.split(line)[1:])
+                       return "started", prog
+
+               if string.find(line, "Continuing.") == 0:
+                       return "continued", None
+
+               if string.find(line, "\x1a\x1a") == 0:
+                       rxcont = re.compile("^\(gdb\)\s+(cont|step|next|stepi|nexti)")
+
+                       if rxcont.search(self.history[his-1]):
+                               return "stepped", None
+
+               return None
+
+
+
+
+
+
+
 
 if __name__ == "__main__":
 
@@ -88,7 +208,6 @@ if __name__ == "__main__":
        dbgterm = GdbTerminal(string.join(sys.argv[1:]))
        dbgwnd = DbgTerminal.DbgWindow(dbgterm)
 
-       DbgTerminal.launchDebugger(dbgwnd, dbgterm)
        gtk.main()