Fixing synchro problems and exit status problems

diff --git a/BreakpointsFrame.py b/BreakpointsFrame.py
index 9f1fe98c53e931c2927796ff4d035fab48ecf55c..7d53cc2cfa699ab4b5048297049d3b6d4b365f74 100644 (file)
--- a/BreakpointsFrame.py
+++ b/BreakpointsFrame.py
@@ -102,7 +102,6 @@ class BreakpointsFrame (StatusFrame.StatusFrame):
        def addBreakpoint(self, file, lineno, cond=None):
 
                no = self.debugger.setBreakpoint(file, lineno, cond)
        def addBreakpoint(self, file, lineno, cond=None):
 
                no = self.debugger.setBreakpoint(file, lineno, cond)

-

                if no!=None:
                        self.addBreakpointToList(no, file, lineno, cond)
                else:
                if no!=None:
                        self.addBreakpointToList(no, file, lineno, cond)
                else:

diff --git a/DbgTerminal.py b/DbgTerminal.py
index ebe4e1a2f147ed16bb8c37474724d02f4811dded..f69d8036fc8e5c3785903acb21f081a823ce268d 100644 (file)
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -9,6 +9,7 @@ import gtk
 import os
 import pango
 import pty
 import os
 import pango
 import pty

+import re

 import string
 import sys
 import time
 import string
 import sys
 import time


@@ -51,7 +52,7 @@ class DbgTerminal (vte.Terminal):
 
        def initialize(self):
                self.childpid = self.fork_command( self.getCommand(), self.getArgv())
 
        def initialize(self):
                self.childpid = self.fork_command( self.getCommand(), self.getArgv())

-               self.waitForActivation(0)
+               self.waitForPrompt(0)

                self.setPty(self.client_ptyslave)
 
        def stopDbg(self):
                self.setPty(self.client_ptyslave)
 
        def stopDbg(self):


@@ -91,18 +92,19 @@ class DbgTerminal (vte.Terminal):
                assert( self.getHistoryLen()>0 )
 
                c,r = term.get_cursor_position()
                assert( self.getHistoryLen()>0 )
 
                c,r = term.get_cursor_position()

-               text = self.get_text_range(self.lastr,self.lastc,r,c-1,lambda *w:True)
+               text = self.get_text_range(self.lastr,0,r,c,lambda *w:True)

                self.lastc, self.lastr = c,r
 
                #Remove annoying \n at the end
                assert(text[-1] == "\n")
                text = text[:-1]
                self.lastc, self.lastr = c,r
 
                #Remove annoying \n at the end
                assert(text[-1] == "\n")
                text = text[:-1]

+

                #Get the lines and remove empty lines
                lines = string.split(text, "\n")
 
                #Remove the incomplete line
                len = max(0,self.getHistoryLen())
                #Get the lines and remove empty lines
                lines = string.split(text, "\n")
 
                #Remove the incomplete line
                len = max(0,self.getHistoryLen())

-               self.history[-1] += lines[0]
+               self.history[-1] = lines[0]

                self.history += lines[1:]
 
 
                self.history += lines[1:]
 
 


@@ -139,7 +141,9 @@ class DbgTerminal (vte.Terminal):
        def getHistoryLen(self):
                return len(self.history)
 
        def getHistoryLen(self):
                return len(self.history)
 

-       def waitForRx(self, rx, start): 
+       def waitForRx(self, pat, start):        
+
+               rx = re.compile(pat)

                curr = start
                while True:
                        assert( curr>=start )
                curr = start
                while True:
                        assert( curr>=start )


@@ -150,7 +154,10 @@ class DbgTerminal (vte.Terminal):
 
                        #Do not forget the last line
                        curr = max(start,self.getHistoryLen()-1)
 
                        #Do not forget the last line
                        curr = max(start,self.getHistoryLen()-1)

-                       gtk.main_iteration()
+                       lr, lc = self.lastr, self.lastc
+
+                       while (self.lastr, self.lastc) == (lr,lc):
+                               gtk.main_iteration()

 
 
        def getCommand(self):
 
 
        def getCommand(self):


@@ -186,7 +193,7 @@ class DbgTerminal (vte.Terminal):
        def getExpression(self, expr):
                raise NotImplementedError()
 
        def getExpression(self, expr):
                raise NotImplementedError()
 

-       def waitForActivation(self, his):               
+       def waitForPrompt(self, his):           

                raise NotImplementedError()
 
        def testForActivity(self, his):
                raise NotImplementedError()
 
        def testForActivity(self, his):

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 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")
        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");
 
                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:
        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))
 
                        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
                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.feed_child("n\n");
 
                #Wait again for (gdb)...

-               self.waitForActivation(his)
+               self.waitForPrompt(his)

 
                return answer
 
 
                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,))
        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")
 
        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+$")
 
                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 = 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:
                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()
 
 
                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"""
                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
 
 
                return None
 

diff --git a/PositionFrame.py b/PositionFrame.py
index a75216350f977066132502bb563362fe4963afdd..29bd6a70bece55c67c4dd698f7b83886d3ac850d 100644 (file)
--- a/PositionFrame.py
+++ b/PositionFrame.py
@@ -32,7 +32,7 @@ class PositionFrame (StatusFrame.StatusFrame):
                vbox = gtk.VBox(False, 5)
                self.add(vbox)
 
                vbox = gtk.VBox(False, 5)
                self.add(vbox)
 

-               hbox = gtk.HBox(False, 4)
+               hbox = gtk.HBox(False, 10)

                vbox.pack_start(hbox, False, False)
                self.openBtn = gtk.Button(":e")
                hbox.pack_start(self.openBtn, False, False)
                vbox.pack_start(hbox, False, False)
                self.openBtn = gtk.Button(":e")
                hbox.pack_start(self.openBtn, False, False)


@@ -77,7 +77,7 @@ class PositionFrame (StatusFrame.StatusFrame):
                        self.file, self.lineno = None, 0
 
                        if status == "exited":
                        self.file, self.lineno = None, 0
 
                        if status == "exited":

-                               self.positionLabel.set_label("Exited.")
+                               self.positionLabel.set_label("Exited with code %d." % param)

                        elif status == "started":
                                self.positionLabel.set_label("Started.")
                        elif status == "continued":
                        elif status == "started":
                                self.positionLabel.set_label("Started.")
                        elif status == "continued":