X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=GdbTerminal.py;h=5be9c05fd165108449fd97150b6712762ee67350;hb=382465d6c2f07b99c0263314405d1d8411072d23;hp=5e6ba6d75d821583107faaccb258991bdd56032a;hpb=3c94180482e4ccd256f087ff182278f083a94276;p=pygdb.git

diff --git a/GdbTerminal.py b/GdbTerminal.py
old mode 100755
new mode 100644
index 5e6ba6d..5be9c05
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -43,9 +43,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 	def setPty(self, pty):
 		ttyname = os.ttyname(pty)
-		len = self.getHistoryLen()
-		self.feed_child("set inferior-tty %s\n" % (ttyname,))
-		self.waitForPrompt(len)
+		self.__getAnswerFromCmd("set inferior-tty %s\n" % (ttyname,))
 
 	def setBreakpoint(self, file, lineno, condition=None):
 		his = self.getHistoryLen()
@@ -74,22 +72,18 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
 	def delBreakpoint(self, breakpoint):
-		his = self.getHistoryLen()
-		self.feed_child("del breakpoint %s\n" % (breakpoint,))
-		self.waitForPrompt(his)
+		self.__getAnswerFromCmd("del breakpoint %s\n" % (breakpoint,))
+
 
 	def getBreakpoints(self):
-		starthis = self.getHistoryLen()
-		self.feed_child("info breakpoints\n")
-		endhis, response = self.waitForPrompt(starthis)
+		bplines = self.__getAnswerFromCmd("info breakpoints\n")
 
 		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
+		i = 1
 
 		#Parse the resulting lines
 		while i<len(bplines):
@@ -104,8 +98,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,":")
@@ -114,7 +107,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]]
@@ -125,11 +118,8 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
 	def getExpression(self, expr):
-
-		his = self.getHistoryLen()
-		self.feed_child("print " + expr + "\n")
-		his, response = self.waitForPrompt(his)
-		answer = self.history[his-1]
+		answer = self.__getAnswerFromCmd("print " + expr + "\n")
+		answer = answer[-1]
 
 		if len(string.split(answer, "=")) == 1:
 			return answer.strip()
@@ -139,18 +129,24 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 	
 	def listCodeSnippet(self):
-		starthis = self.getHistoryLen()
-		self.feed_child("list\n")
-		endhis, response = self.waitForPrompt(starthis)
-
-		text = string.join(self.history[starthis:endhis], "\n")
-		return text
+		answ = self.__getAnswerFromCmd("list\n")
+		return string.join(answ, "\n")
 
+	def getBacktrace(self):
+		answ = self.__getAnswerFromCmd("bt\n")
+		return string.join(answ, "\n")
 
 	def waitForPrompt(self, his):
 		rx = "^\(gdb\)"
 		return self.waitForRx(rx,his)
 
+	def __getAnswerFromCmd(self, cmd):
+		starthis = self.getHistoryLen()
+		self.feed_child(cmd)
+		endhis, response = self.waitForPrompt(starthis)
+
+		return self.history[starthis:endhis]
+
 
 	def testForActivity(self, his):
 		"""Test whether debugger got active again"""
@@ -164,11 +160,14 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 		if string.find(line, "Program exited") == 0:
 			code = string.split(line)[-1]
-			code = code[1:-1]
 
 			codeno = 0
-			for c in code:
-				codeno = codeno*8 + int(c)
+		
+			#Parse the octal number
+			if code[0] == "O":
+				code = code[1:-1]
+				for c in code:
+					codeno = codeno*8 + int(c)
 
 			return "exited", codeno