changed some stuff of active/inactive detection

[pygdb.git] / GdbTerminal.py

diff --git a/GdbTerminal.py b/GdbTerminal.py
index 7341cae049379a2f9342e887f482f43acef56fdf..15cb11df2bb233c8c7881db3e2c255cf0de77327 100755 (executable)
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -28,26 +28,17 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                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_child("run " + argv + "\n")
-               return self.waitForActivation(his)
 
        def setContinue(self):
-               his = self.getHistoryLen()
                self.feed_child("cont\n");
-               return self.waitForActivation(his)
 
        def setStepover(self):
-               his = self.getHistoryLen()
                self.feed_child("next\n");
-               return self.waitForActivation(his)
 
        def setStepin(self):
-               his = self.getHistoryLen()
                self.feed_child("step\n");
-               return self.waitForActivation(his)
 
        def setQuit(self):
                self.feed_child("quit\n")
@@ -65,30 +56,30 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                rx = re.compile("^Breakpoint |^No |^\(gdb\) ")
                his, response = self.waitForRx(rx, his)
 
-               if response[0:10] == "Breakpoint":
-                       return string.split(response)[1].strip()
+               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");
-                       return None
 
-               #Wait again for gdb
-               if response[0:5] != "(gdb)":
-                       his, response = self.waitForRx(rx,his)
+               #Wait again for (gdb)...
+               self.waitForActivation(his)
 
-               return None
+               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")
-
-               rx = re.compile("^\(gdb\) ")
-               endhis, response = self.waitForRx(rx, starthis)
-
+               endhis, response = self.__waitForPrompt(starthis)
 
                rxbp = re.compile("^\d+\s+breakpoint")
                rxpos = re.compile("^.* at \S+:\d+$")
@@ -135,10 +126,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
                his = self.getHistoryLen()
                self.feed_child("print " + expr + "\n")
-
-               rx = re.compile("^\(gdb\) $")
-               his, response = self.waitForRx(rx, his)
-
+               his, response = self.__waitForPrompt(his)
                answer = self.history[his-1]
 
                if len(string.split(answer, "=")) == 1:
@@ -148,24 +136,71 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                return string.join(split[1:], "=").strip()
 
 
-       def waitForActivation(self, starthis=None):
-
-               if starthis == None:
-                       starthis = self.getHistoryLen()
+       def waitForActivation(self, starthis):
 
                self.setActive(False)
-               rx = re.compile("^\(gdb\) $")
-               endhis, reponse = self.waitForRx(rx,starthis)
+               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: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__":