X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=GdbTerminal.py;h=ff6dc6b37356133c8d526fbb1f02f9f0dd6c9d3a;hb=afd9117c8d1d5f614acc120f28c668655be20abf;hp=8600c90d0a94e4e7f1f1733f15a1bf70f8551727;hpb=0296b6d5afe20a15764842873917bf1d6aa34b77;p=pygdb.git

diff --git a/GdbTerminal.py b/GdbTerminal.py
old mode 100755
new mode 100644
index 8600c90..ff6dc6b
--- 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+$")
@@ -102,8 +104,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 			#This line does not contain the file!
 			if not rxpos.search(line):
-				i += 1
-				line = bplines[i]
+				continue
 
 			pos = string.split(line)[-1]
 			[file,lineno] = string.split(pos,":")
@@ -112,7 +113,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 			if i+1<len(bplines) and rxcond.search(bplines[i+1]):
 				i +=1
 				line = bplines[i]
-				pre,cond = string.split(line,"if")
+				cond = string.join(string.split(line," if ")[1:], " if ")
 				cond = cond.strip()
 
 			bpnts += [[no, file, lineno, cond]]
@@ -126,7 +127,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:
@@ -135,43 +136,43 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		split = string.split(answer, "=")
 		return string.join(split[1:], "=").strip()
 
+	
+	def listCodeSnippet(self):
+		starthis = self.getHistoryLen()
+		self.feed_child("list\n")
+		endhis, response = self.waitForPrompt(starthis)
 
-	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
+		text = string.join(self.history[starthis:endhis], "\n")
+		return text
 
 
-	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]
 
-			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
+		
+			#Parse the octal number
+			if code[0] == "O":
+				code = code[1:-1]
+				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
 
@@ -179,15 +180,20 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 	def testForInactivity(self, his):
 		"""Test whether debugger got inactive"""		
 		line = self.history[his]
-		rxcont = re.compile("^\(gdb\)\s+(cont|step|next|stepi|nexti)")
 
 		if string.find(line, "Starting program:") == 0:
 			prog = string.join( string.split(line)[1:])
 			return "started", prog
 
-		if rxcont.search(line):
+		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