Fixing synchro problems and exit status problems

[pygdb.git] / GdbTerminal.py

diff --git a/GdbTerminal.py b/GdbTerminal.py
index 15cb11df2bb233c8c7881db3e2c255cf0de77327..579849dea5816e2494894c7b606087d4f167d78c 100755 (executable)
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -23,10 +23,6 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
        def getArgv(self):
                return ["gdb", "--fullname", string.split(self.clientCmd)[0]]
 
-       def setPty(self, pty):
-               ttyname = os.ttyname(pty)
-               self.feed_child("set inferior-tty %s\n" % (ttyname,))
-
        def setRun(self):
                argv = string.join(string.split(self.clientCmd)[1:])
                self.feed_child("run " + argv + "\n")
@@ -45,6 +41,12 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                self.waitForNewline()
                self.feed_child("y\n");
 
+       def setPty(self, pty):
+               ttyname = os.ttyname(pty)
+               len = self.getHistoryLen()
+               self.feed_child("set inferior-tty %s\n" % (ttyname,))
+               self.waitForPrompt(len)
+
        def setBreakpoint(self, file, lineno, condition=None):
                his = self.getHistoryLen()
                if condition==None:
@@ -53,7 +55,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                        self.feed_child("break %s:%s if %s\n" % \
                                        (file, str(lineno), condition))
 
-               rx = re.compile("^Breakpoint |^No |^\(gdb\) ")
+               rx = "^Breakpoint |^No |^\(gdb\) "
                his, response = self.waitForRx(rx, his)
 
                answer = None
@@ -66,7 +68,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                        self.feed_child("n\n");
 
                #Wait again for (gdb)...
-               self.waitForActivation(his)
+               self.waitForPrompt(his)
 
                return answer
 
@@ -74,12 +76,12 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
        def delBreakpoint(self, breakpoint):
                his = self.getHistoryLen()
                self.feed_child("del breakpoint %s\n" % (breakpoint,))
-               self.waitForActivation(his)
+               self.waitForPrompt(his)
 
        def getBreakpoints(self):
                starthis = self.getHistoryLen()
                self.feed_child("info breakpoints\n")
-               endhis, response = self.__waitForPrompt(starthis)
+               endhis, response = self.waitForPrompt(starthis)
 
                rxbp = re.compile("^\d+\s+breakpoint")
                rxpos = re.compile("^.* at \S+:\d+$")
@@ -126,7 +128,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
                his = self.getHistoryLen()
                self.feed_child("print " + expr + "\n")
-               his, response = self.__waitForPrompt(his)
+               his, response = self.waitForPrompt(his)
                answer = self.history[his-1]
 
                if len(string.split(answer, "=")) == 1:
@@ -136,42 +138,30 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
                return string.join(split[1:], "=").strip()
 
 
-       def waitForActivation(self, starthis):
-
-               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\) ")
+       def waitForPrompt(self, his):
+               rx = "^\(gdb\)"
                return self.waitForRx(rx,his)
 
 
        def testForActivity(self, his):
                """Test whether debugger got active again"""
-               rx = re.compile("^\(gdb\) ")
+                       
+               line = self.history[his]
+
+               if string.find(line, "\x1a\x1a") == 0:
+                       tuples = string.split(line[2:], ":")
+                       tuples[1] = int(tuples[1])
+                       return "break", [tuples[0], int(tuples[1])]
 
-               #Aha! There is a prompt...
-               if rx.search(self.history[his]):
-                       line = self.history[his-1]
+               if string.find(line, "Program exited") == 0:
+                       code = string.split(line)[-1]
+                       code = code[1:-1]
 
-                       if line[0:2]=="\x1a\x1a":
-                               tuples = string.split(line[2:], ":")
-                               tuples[1] = int(tuples[1])
-                               return "break", [tuples[0], int(tuples[1])]
+                       codeno = 0
+                       for c in code:
+                               codeno = codeno*8 + int(c)
 
-                       if string.find(line, "Program exited") == 0:
-                               code = string.split(line)[-1]
-                               code = code[:-1]
-                               return "exited", code
+                       return "exited", codeno
 
                return None